diff --git a/data/themes/default_error.edc b/data/themes/default_error.edc
index 6c168e673..cd744c0ae 100644
--- a/data/themes/default_error.edc
+++ b/data/themes/default_error.edc
@@ -25,7 +25,7 @@ group {
 	    }
 	    image {
 	       normal: "e17_menu_bg.png";
-	       border: 3 3 3 3;
+	       border: 2 2 2 2;
 	    }
 	 }
       }
diff --git a/data/themes/default_menu.edc b/data/themes/default_menu.edc
index 550d78a32..4f9135ad4 100644
--- a/data/themes/default_menu.edc
+++ b/data/themes/default_menu.edc
@@ -25,7 +25,7 @@ group {
 	    }
 	    image {
 	       normal: "e17_menu_bg.png";
-	       border: 3 3 3 3;
+	       border: 2 2 2 2;
 	    }
 	 }
       }
diff --git a/data/themes/default_resize.edc b/data/themes/default_resize.edc
index 9d09ecf84..f42396e3f 100644
--- a/data/themes/default_resize.edc
+++ b/data/themes/default_resize.edc
@@ -19,7 +19,7 @@ group {
 	    }
 	    image {
 	       normal: "e17_menu_bg.png";
-	       border: 3 3 3 3;
+	       border: 2 2 2 2;
 	    }
 	 }
       }
diff --git a/data/themes/images/e17_border1.png b/data/themes/images/e17_border1.png
index c6f8f6083..fb7e94981 100644
Binary files a/data/themes/images/e17_border1.png and b/data/themes/images/e17_border1.png differ
diff --git a/data/themes/images/e17_border2.png b/data/themes/images/e17_border2.png
index 71ba67722..0de306965 100644
Binary files a/data/themes/images/e17_border2.png and b/data/themes/images/e17_border2.png differ
diff --git a/data/themes/images/e17_border3.png b/data/themes/images/e17_border3.png
index 78b50076a..45b39780f 100644
Binary files a/data/themes/images/e17_border3.png and b/data/themes/images/e17_border3.png differ
diff --git a/data/themes/images/e17_border4.png b/data/themes/images/e17_border4.png
index fcd95b178..441a45853 100644
Binary files a/data/themes/images/e17_border4.png and b/data/themes/images/e17_border4.png differ
diff --git a/data/themes/images/e17_border5.png b/data/themes/images/e17_border5.png
index ca4e74917..437fd83f4 100644
Binary files a/data/themes/images/e17_border5.png and b/data/themes/images/e17_border5.png differ
diff --git a/data/themes/images/e17_border6.png b/data/themes/images/e17_border6.png
index 4c0e95bb1..7ea165335 100644
Binary files a/data/themes/images/e17_border6.png and b/data/themes/images/e17_border6.png differ
diff --git a/data/themes/images/e17_border7.png b/data/themes/images/e17_border7.png
index b41a8cf9f..e6e12f831 100644
Binary files a/data/themes/images/e17_border7.png and b/data/themes/images/e17_border7.png differ
diff --git a/data/themes/images/e17_menu_bg.png b/data/themes/images/e17_menu_bg.png
index 8f79ce135..b3218dceb 100644
Binary files a/data/themes/images/e17_menu_bg.png and b/data/themes/images/e17_menu_bg.png differ