diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 6d2a135b8..256cc3f1e 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -259,6 +259,9 @@ img/slider_run_bevel_horiz.png \
 img/slider_run_bevel_vert.png \
 img/slot_horiz_bottom.png \
 img/slot_horiz_top.png \
+img/spanner_glow.png \
+img/spanner_hilight.png \
+img/spanner_inset.png \
 img/speaker.png \
 img/speaker_shadow.png \
 img/sym_check_alum.png \
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 649766e10..0483a3b98 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -60,12 +60,12 @@ collections {
 #include "edc/evrything.edc"
 
 // port unchanged stuff so this can work as a replacement
-#include "edc/O/conf_gad.edc"
 #include "edc/O/illume_gad.edc"
 #include "edc/O/border_icons.edc"
 #include "edc/O/efm_icons.edc"
 #include "edc/O/icons.edc"
 #include "edc/O/wallpaper.edc"
+//#include "edc/O/conf_gad.edc"
 //#include "edc/O/evrything.edc"
 //#include "edc/O/battery.edc"
 //#include "edc/O/mixer.edc"
diff --git a/data/themes/edc/conf.edc b/data/themes/edc/conf.edc
index 1cb99859b..1d277aa11 100644
--- a/data/themes/edc/conf.edc
+++ b/data/themes/edc/conf.edc
@@ -52,3 +52,91 @@ group { name: "e/widgets/configure/main";
       }
    }
 }
+
+group { name: "e/modules/conf/main";
+   images.image: "button_normal.png" COMP;
+   images.image: "button_clicked.png" COMP;
+   images.image: "spanner_inset.png" COMP;
+   images.image: "spanner_hilight.png" COMP;
+   images.image: "spanner_glow.png" COMP;
+   min: 16 16;
+   max: 80 80;
+   parts {
+      part { name: "base";
+         description { state: "default" 0.0;
+            image.normal: "button_normal.png";
+            image.border: 4 4 3 5;
+            image.middle: SOLID;
+            rel1.offset: -1 0;
+            rel2.offset: 0 1;
+            fill.smooth: 0;
+         }
+         description { state: "clicked" 0.0;
+            inherit: "default" 0.0;
+            image.normal: "button_clicked.png";
+            image.border: 5 5 4 6;
+         }
+      }
+      part { name: "spanner_hilight"; mouse_events: 0;
+         description { state: "default" 0.0;
+            aspect: 1.0 1.0; aspect_preference: BOTH;
+            max: 80 80;
+            rel1.offset: 0 1;
+            rel1.to: "spanner";
+            rel2.offset: -1 0;
+            rel2.to: "spanner";
+            image.normal: "spanner_hilight.png";
+         }
+      }
+      part { name: "spanner"; mouse_events: 0;
+         description { state: "default" 0.0;
+            aspect: 1.0 1.0; aspect_preference: BOTH;
+            max: 80 80;
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
+            image.normal: "spanner_inset.png";
+         }
+      }
+      part { name: "spanner_glow"; mouse_events: 0;
+         description { state: "default" 0.0;
+            aspect: 1.0 1.0; aspect_preference: BOTH;
+            max: 80 80;
+            rel1.to: "spanner";
+            rel2.to: "spanner";
+            image.normal: "spanner_glow.png";
+            visible: 0;
+         }
+         description { state: "clicked" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+   }
+   programs {
+      program {
+         signal: "mouse,down,1"; source: "base";
+         action: STATE_SET "clicked" 0.0;
+         target: "base";
+      }
+      program {
+         signal: "mouse,up,1"; source: "base";
+         action: STATE_SET "default" 0.0;
+         target: "base";
+         target: "spanner_glow";
+      }
+      program {
+         signal: "mouse,clicked,1*"; source: "base";
+         action: SIGNAL_EMIT "e,action,conf" "";
+      }
+      program {
+         signal: "mouse,in"; source: "base";
+         action: STATE_SET "clicked" 0.0;
+         target: "spanner_glow";
+      }
+      program {
+         signal: "mouse,out"; source: "base";
+         action: STATE_SET "default" 0.0;
+         target: "spanner_glow";
+      }
+   }
+}
diff --git a/data/themes/img/spanner_glow.png b/data/themes/img/spanner_glow.png
new file mode 100644
index 000000000..bd3d5ff35
Binary files /dev/null and b/data/themes/img/spanner_glow.png differ
diff --git a/data/themes/img/spanner_hilight.png b/data/themes/img/spanner_hilight.png
new file mode 100644
index 000000000..ea821244d
Binary files /dev/null and b/data/themes/img/spanner_hilight.png differ
diff --git a/data/themes/img/spanner_inset.png b/data/themes/img/spanner_inset.png
new file mode 100644
index 000000000..040fae0ee
Binary files /dev/null and b/data/themes/img/spanner_inset.png differ