diff --git a/data/themes/default_error.edc b/data/themes/default_error.edc
index f267ba232..6c168e673 100644
--- a/data/themes/default_error.edc
+++ b/data/themes/default_error.edc
@@ -1,9 +1,9 @@
 images {
-   image: "e.png" COMP;
-   image: "button_in.png" COMP;
-   image: "button_out.png" COMP;
-   image: "error_bg.png" COMP;
+   image: "e17_logo.png" COMP;
+   image: "e17_button2.png" COMP;
+   image: "e17_button.png" COMP;
 }
+
 group {
    name: "error/main";
    min: 400 200;
@@ -24,7 +24,7 @@ group {
 	       offset:   -1   -1;
 	    }
 	    image {
-	       normal: "error_bg.png";
+	       normal: "e17_menu_bg.png";
 	       border: 3 3 3 3;
 	    }
 	 }
@@ -44,7 +44,7 @@ group {
 	       offset:   80   80;
 	    }
 	    image {
-	       normal: "e.png";
+	       normal: "e17_logo.png";
 	    }
 	 }
       }
@@ -112,7 +112,7 @@ group {
 	       offset:   -1   -17;
 	    }
 	    image {
-	       normal: "button_out.png";
+	       normal: "e17_button.png";
 	       border: 8 8 8 8;
 	    }
 	 }
@@ -129,7 +129,7 @@ group {
 	       offset:   -1   -17;
 	    }
 	    image {
-	       normal: "button_in.png";
+	       normal: "e17_button2.png";
 	       border: 8 8 8 8;
 	    }
 	 }
diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am
index cc6326934..1ada382e8 100644
--- a/data/themes/images/Makefile.am
+++ b/data/themes/images/Makefile.am
@@ -252,8 +252,5 @@ e17_temperature_mid.png \
 e17_temperature_overlay.png \
 e17_gadman_indicator.png \
 e17_gadman_overlay.png \
-button_in.png \
-button_out.png \
-e.png \
-error_bg.png
+e17_logo.png
 
diff --git a/data/themes/images/button_in.png b/data/themes/images/button_in.png
deleted file mode 100644
index 70f60a570..000000000
Binary files a/data/themes/images/button_in.png and /dev/null differ
diff --git a/data/themes/images/button_out.png b/data/themes/images/button_out.png
deleted file mode 100644
index ae14e1ccd..000000000
Binary files a/data/themes/images/button_out.png and /dev/null differ
diff --git a/data/themes/images/e.png b/data/themes/images/e.png
deleted file mode 100644
index 1bf37cc5e..000000000
Binary files a/data/themes/images/e.png and /dev/null differ
diff --git a/data/themes/images/e17_logo.png b/data/themes/images/e17_logo.png
new file mode 100644
index 000000000..c48cac7f4
Binary files /dev/null and b/data/themes/images/e17_logo.png differ
diff --git a/data/themes/images/error_bg.png b/data/themes/images/error_bg.png
deleted file mode 100644
index ad7ccda98..000000000
Binary files a/data/themes/images/error_bg.png and /dev/null differ