diff --git a/configure.ac b/configure.ac
index 6f297c8fb..090d527d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -339,6 +339,12 @@ data/pictures/backgrounds/Makefile
 data/pictures/screensaver/Makefile
 data/scripts/Makefile
 data/themes/Makefile
+data/themes/Neutrino-3.0/Makefile
+data/themes/Neutrino-3.0/icons/Makefile
+data/themes/Neutrino-3.0/icons/buttons/Makefile
+data/themes/Olive-3.0/Makefile
+data/themes/Olive-3.0/icons/Makefile
+data/themes/Olive-3.0/icons/buttons/Makefile
 data/y-web/Makefile
 data/y-web/images/Makefile
 data/y-web/languages/Makefile
diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 8914d5b0e..e29238df3 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -1,5 +1,9 @@
 installdir = $(THEMESDIR)
 
+SUBDIRS = \
+	Neutrino-3.0/icons/buttons \
+	Olive-3.0/icons/buttons
+
 install_DATA = \
 	Bluemoon-3.0.theme \
 	Classic.theme \
diff --git a/data/themes/Neutrino-3.0/Makefile.am b/data/themes/Neutrino-3.0/Makefile.am
new file mode 100644
index 000000000..bbdeaf88b
--- /dev/null
+++ b/data/themes/Neutrino-3.0/Makefile.am
@@ -0,0 +1 @@
+subdir = icons
diff --git a/data/themes/Neutrino-3.0/icons/Makefile.am b/data/themes/Neutrino-3.0/icons/Makefile.am
new file mode 100644
index 000000000..269beb1b0
--- /dev/null
+++ b/data/themes/Neutrino-3.0/icons/Makefile.am
@@ -0,0 +1 @@
+subdir = buttons
diff --git a/data/themes/Neutrino-3.0/icons/buttons/Makefile.am b/data/themes/Neutrino-3.0/icons/buttons/Makefile.am
new file mode 100644
index 000000000..70d199d75
--- /dev/null
+++ b/data/themes/Neutrino-3.0/icons/buttons/Makefile.am
@@ -0,0 +1,7 @@
+installdir = $(THEMESDIR)/Neutrino-3.0/icons
+
+install_DATA = \
+	btn_option_off_active.png \
+	btn_option_off_inactive.png \
+	btn_option_on_active.png \
+	btn_option_on_inactive.png
diff --git a/data/themes/Neutrino-3.0/icons/buttons/btn_option_off_active.png b/data/themes/Neutrino-3.0/icons/buttons/btn_option_off_active.png
new file mode 100644
index 000000000..409fbce35
Binary files /dev/null and b/data/themes/Neutrino-3.0/icons/buttons/btn_option_off_active.png differ
diff --git a/data/themes/Neutrino-3.0/icons/buttons/btn_option_off_inactive.png b/data/themes/Neutrino-3.0/icons/buttons/btn_option_off_inactive.png
new file mode 100644
index 000000000..97c54a413
Binary files /dev/null and b/data/themes/Neutrino-3.0/icons/buttons/btn_option_off_inactive.png differ
diff --git a/data/themes/Neutrino-3.0/icons/buttons/btn_option_on_active.png b/data/themes/Neutrino-3.0/icons/buttons/btn_option_on_active.png
new file mode 100644
index 000000000..c8bf94f3e
Binary files /dev/null and b/data/themes/Neutrino-3.0/icons/buttons/btn_option_on_active.png differ
diff --git a/data/themes/Neutrino-3.0/icons/buttons/btn_option_on_inactive.png b/data/themes/Neutrino-3.0/icons/buttons/btn_option_on_inactive.png
new file mode 100644
index 000000000..f5044cd40
Binary files /dev/null and b/data/themes/Neutrino-3.0/icons/buttons/btn_option_on_inactive.png differ
diff --git a/data/themes/Olive-3.0/Makefile.am b/data/themes/Olive-3.0/Makefile.am
new file mode 100644
index 000000000..5621c06e9
--- /dev/null
+++ b/data/themes/Olive-3.0/Makefile.am
@@ -0,0 +1,2 @@
+SUBDIRS = icons
+
diff --git a/data/themes/Olive-3.0/icons/Makefile.am b/data/themes/Olive-3.0/icons/Makefile.am
new file mode 100644
index 000000000..e698a28d0
--- /dev/null
+++ b/data/themes/Olive-3.0/icons/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = buttons
diff --git a/data/themes/Olive-3.0/icons/buttons/Makefile.am b/data/themes/Olive-3.0/icons/buttons/Makefile.am
new file mode 100644
index 000000000..c16b1a564
--- /dev/null
+++ b/data/themes/Olive-3.0/icons/buttons/Makefile.am
@@ -0,0 +1,7 @@
+installdir = $(THEMESDIR)/Olive-3.0/icons
+
+install_DATA = \
+	btn_option_off_active.png \
+	btn_option_off_inactive.png \
+	btn_option_on_active.png \
+	btn_option_on_inactive.png
diff --git a/data/themes/Olive-3.0/icons/buttons/btn_option_off_active.png b/data/themes/Olive-3.0/icons/buttons/btn_option_off_active.png
new file mode 100644
index 000000000..8a6404425
Binary files /dev/null and b/data/themes/Olive-3.0/icons/buttons/btn_option_off_active.png differ
diff --git a/data/themes/Olive-3.0/icons/buttons/btn_option_off_inactive.png b/data/themes/Olive-3.0/icons/buttons/btn_option_off_inactive.png
new file mode 100644
index 000000000..248af54a2
Binary files /dev/null and b/data/themes/Olive-3.0/icons/buttons/btn_option_off_inactive.png differ
diff --git a/data/themes/Olive-3.0/icons/buttons/btn_option_on_active.png b/data/themes/Olive-3.0/icons/buttons/btn_option_on_active.png
new file mode 100644
index 000000000..19297a4fa
Binary files /dev/null and b/data/themes/Olive-3.0/icons/buttons/btn_option_on_active.png differ
diff --git a/data/themes/Olive-3.0/icons/buttons/btn_option_on_inactive.png b/data/themes/Olive-3.0/icons/buttons/btn_option_on_inactive.png
new file mode 100644
index 000000000..5fb8576e1
Binary files /dev/null and b/data/themes/Olive-3.0/icons/buttons/btn_option_on_inactive.png differ