diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 2b017152b..a62ae1942 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -23,7 +23,8 @@ default_ibar.edc \
 default_menu.edc \
 default_pager.edc \
 default_resize.edc \
-default_temperature.edc
+default_temperature.edc \
+default_error.edc
 
 default.eet: Makefile $(EXTRA_DIST)
 	$(EDJE_CC) $(EDJE_FLAGS) \
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 49acf0c06..a163823fc 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -19,7 +19,7 @@
 fonts {
    font: "Vera.ttf"   "Edje Vera";
    //   font: "kochi-gothic.ttf"   "Edje Vera";
-   //   font: "VeraBd.ttf" "Edje Vera Bold";
+   font: "VeraBd.ttf" "Edje Vera Bold";
 }
 
 collections {
@@ -33,5 +33,6 @@ collections {
 #include "default_pager.edc"
 #include "default_resize.edc"
 #include "default_temperature.edc"
+#include "default_error.edc"
 }
 
diff --git a/data/themes/default_error.edc b/data/themes/default_error.edc
new file mode 100644
index 000000000..f267ba232
--- /dev/null
+++ b/data/themes/default_error.edc
@@ -0,0 +1,183 @@
+images {
+   image: "e.png" COMP;
+   image: "button_in.png" COMP;
+   image: "button_out.png" COMP;
+   image: "error_bg.png" COMP;
+}
+group {
+   name: "error/main";
+   min: 400 200;
+   max: 400 200;
+   parts {
+      part {
+	 name:          "bg";
+	 type:          IMAGE;
+	 mouse_events:  0;
+	 description {
+	    state:    "default" 0.0;
+	    rel1 {
+	       relative: 0.0  0.0;
+	       offset:   0    0;
+	    }
+	    rel2 {
+	       relative: 1.0  1.0;
+	       offset:   -1   -1;
+	    }
+	    image {
+	       normal: "error_bg.png";
+	       border: 3 3 3 3;
+	    }
+	 }
+      }
+      part {
+	 name:          "e";
+	 type:          IMAGE;
+	 mouse_events:  0;
+	 description {
+	    state:    "default" 0.0;
+	    rel1 {
+	       relative: 0.0  0.0;
+	       offset:   16   16;
+	    }
+	    rel2 {
+	       relative: 0.0  0.0;
+	       offset:   80   80;
+	    }
+	    image {
+	       normal: "e.png";
+	    }
+	 }
+      }
+      part {
+	 name:          "title";
+	 type:          TEXT;
+	 effect:        SHADOW;
+	 mouse_events:  0;
+	 description {
+	    state:    "default" 0.0;
+	    rel1 {
+	       relative: 1.0  0.0;
+	       offset:   16   0;
+	       to:       "e";
+	    }
+	    rel2 {
+	       relative: 1.0  1.0;
+	       offset:   -1   -1;
+	       to_y:     "e";
+	    }
+	    color:    0   0   0 255;
+	    color3: 255 255 255 128;
+	    text {
+	       text:     "Title";
+	       font:     "Edje Vera Bold";
+	       size:     12;
+	       min:      0 0;
+	       align:    0.0 0.5;
+	    }
+	 }
+      }
+      part {
+	 name:          "text";
+	 type:          SWALLOW;
+	 mouse_events:  0;
+	 description {
+	    state:    "default" 0.0;
+	    rel1 {
+	       relative: 0.0  1.0;
+	       offset:   16   16;
+	       to_y:     "e";
+	    }
+	    rel2 {
+	       relative: 1.0  0.0;
+	       offset:   -1   -16;
+	       to_y:     "button_image";
+	    }
+	    color: 0 0 0 0;
+	 }
+      }
+      part {
+	 name:          "button_image";
+	 type:          IMAGE;
+	 mouse_events:  1;
+	 description {
+	    state:    "default" 0.0;
+            min:      64 32;
+            max:      64 32;
+	    rel1 {
+	       relative: 0.0  1.0;
+	       offset:   0    -49;
+	    }
+	    rel2 {
+	       relative: 1.0  1.0;
+	       offset:   -1   -17;
+	    }
+	    image {
+	       normal: "button_out.png";
+	       border: 8 8 8 8;
+	    }
+	 }
+	 description {
+	    state:    "clicked" 0.0;
+            min:      64 32;
+            max:      64 32;
+	    rel1 {
+	       relative: 0.0  1.0;
+	       offset:   0    -49;
+	    }
+	    rel2 {
+	       relative: 1.0  1.0;
+	       offset:   -1   -17;
+	    }
+	    image {
+	       normal: "button_in.png";
+	       border: 8 8 8 8;
+	    }
+	 }
+      }
+      part {
+	 name:          "button_text";
+	 type:          TEXT;
+	 effect:        SHADOW;
+	 mouse_events:  0;
+	 description {
+	    state:    "default" 0.0;
+	    rel1 {
+	       relative: 0.0  0.0;
+	       offset:   0    0;
+	       to:     "button_image";
+	    }
+	    rel2 {
+	       relative: 1.0  1.0;
+	       offset:   -1   -1;
+	       to:     "button_image";
+	    }
+	    color:    0   0   0 255;
+	    color3: 255 255 255 128;
+	    text {
+	       text:     "OK";
+	       font:     "Edje Vera";
+	       size:     10;
+	       min:      0 0;
+	       align:    0.5 0.5;
+	    }
+	 }
+      }
+   }
+   programs {
+      program {
+	 name:   "button_click";
+	 signal: "mouse,down,1";
+	 source: "button_image";
+	 action: STATE_SET "clicked" 0.0;
+	 target: "button_image";
+      }
+      program {
+	 name:   "button_unclick";
+	 signal: "mouse,up,1";
+	 source: "button_image";
+	 action: STATE_SET "default" 0.0;
+	 target: "button_image";
+	 action: SIGNAL_EMIT "close" "";
+      }
+   }
+}
diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am
index 15f3428e0..cc6326934 100644
--- a/data/themes/images/Makefile.am
+++ b/data/themes/images/Makefile.am
@@ -251,5 +251,9 @@ e17_temperature_base.png \
 e17_temperature_mid.png \
 e17_temperature_overlay.png \
 e17_gadman_indicator.png \
-e17_gadman_overlay.png
+e17_gadman_overlay.png \
+button_in.png \
+button_out.png \
+e.png \
+error_bg.png
 
diff --git a/data/themes/images/button_in.png b/data/themes/images/button_in.png
new file mode 100644
index 000000000..70f60a570
Binary files /dev/null and b/data/themes/images/button_in.png differ
diff --git a/data/themes/images/button_out.png b/data/themes/images/button_out.png
new file mode 100644
index 000000000..ae14e1ccd
Binary files /dev/null and b/data/themes/images/button_out.png differ
diff --git a/data/themes/images/e.png b/data/themes/images/e.png
new file mode 100644
index 000000000..1bf37cc5e
Binary files /dev/null and b/data/themes/images/e.png differ
diff --git a/data/themes/images/error_bg.png b/data/themes/images/error_bg.png
new file mode 100644
index 000000000..ad7ccda98
Binary files /dev/null and b/data/themes/images/error_bg.png differ