diff --git a/data/themes/default_icons.edc b/data/themes/default_icons.edc
index 2318c48ee..989f83514 100644
--- a/data/themes/default_icons.edc
+++ b/data/themes/default_icons.edc
@@ -657,78 +657,6 @@ group {
       }
    }
 }
-group {
-   name: "e/icons/widget/new_dialog";
-   parts {
-      part {
-	 name:          "icon";
-	 mouse_events:  0;
-	 description {
-	    state:    "default" 0.0;
-	    aspect:   0.83333333333 0.83333333333;
-	    aspect_preference: BOTH;
-	    max:      10 12;
-	    image {
-	       normal: "e17_icon_right_arrow.png";
-	    }
-	 }
-      }
-   }
-}
-group {
-   name: "e/icons/widget/up_arrow";
-   parts {
-      part {
-	 name:          "icon";
-	 mouse_events:  0;
-	 description {
-	    state:    "default" 0.0;
-	    aspect:   0.83333333333 0.83333333333;
-	    aspect_preference: BOTH;
-	    max:      12 10;
-	    image {
-	       normal: "e17_icon_up_arrow.png";
-	    }
-	 }
-      }
-   }
-}
-group {
-   name: "e/icons/widget/down_arrow";
-   parts {
-      part {
-	 name:          "icon";
-	 mouse_events:  0;
-	 description {
-	    state:    "default" 0.0;
-	    aspect:   0.83333333333 0.83333333333;
-	    aspect_preference: BOTH;
-	    max:      12 10;
-	    image {
-	       normal: "e17_icon_down_arrow.png";
-	    }
-	 }
-      }
-   }
-}
-group {
-   name: "e/icons/widget/up_dir";
-   parts {
-      part {
-	 name:          "icon";
-	 mouse_events:  0;
-	 description {
-	    state:    "default" 0.0;
-	    aspect:   0.83333333333 0.83333333333;
-	    aspect_preference: BOTH;
-	    max:      12 10;
-	    image {
-	       normal: "e17_icon_up_arrow.png";
-	    }
-	 }
-      }
-   }
-}
 group {
    name: "e/icons/enlightenment/mouse";
    max:  64 64;
@@ -2417,7 +2345,6 @@ group {
    }
 }
 
-
 group {
    name: "e/icons/widget/config";
    max:  64 64;
@@ -2438,6 +2365,81 @@ group {
    }
 }
 
+group {
+   name: "e/icons/widget/new_dialog";
+   parts {
+      part {
+	 name:          "icon";
+	 mouse_events:  0;
+	 description {
+	    state:    "default" 0.0;
+	    aspect:   0.83333333333 0.83333333333;
+	    aspect_preference: BOTH;
+	    max:      10 12;
+	    image {
+	       normal: "e17_icon_right_arrow.png";
+	    }
+	 }
+      }
+   }
+}
+
+group {
+   name: "e/icons/widget/up_arrow";
+   parts {
+      part {
+	 name:          "icon";
+	 mouse_events:  0;
+	 description {
+	    state:    "default" 0.0;
+	    aspect:   0.83333333333 0.83333333333;
+	    aspect_preference: BOTH;
+	    max:      12 10;
+	    image {
+	       normal: "e17_icon_up_arrow.png";
+	    }
+	 }
+      }
+   }
+}
+
+group {
+   name: "e/icons/widget/down_arrow";
+   parts {
+      part {
+	 name:          "icon";
+	 mouse_events:  0;
+	 description {
+	    state:    "default" 0.0;
+	    aspect:   0.83333333333 0.83333333333;
+	    aspect_preference: BOTH;
+	    max:      12 10;
+	    image {
+	       normal: "e17_icon_down_arrow.png";
+	    }
+	 }
+      }
+   }
+}
+
+group {
+   name: "e/icons/widget/up_dir";
+   parts {
+      part {
+	 name:          "icon";
+	 mouse_events:  0;
+	 description {
+	    state:    "default" 0.0;
+	    aspect:   0.83333333333 0.83333333333;
+	    aspect_preference: BOTH;
+	    max:      12 10;
+	    image {
+	       normal: "e17_icon_up_arrow.png";
+	    }
+	 }
+      }
+   }
+}
 
 // Dummy icon filler. Replace these with their own group and icon.
 group {
diff --git a/data/themes/images/e17_icon_mixer.png b/data/themes/images/e17_icon_mixer.png
index 6a4ebd2bf..0bc59d50d 100644
Binary files a/data/themes/images/e17_icon_mixer.png and b/data/themes/images/e17_icon_mixer.png differ
diff --git a/data/themes/images/e17_icon_pager.png b/data/themes/images/e17_icon_pager.png
index 1d74a0258..c574b8a03 100644
Binary files a/data/themes/images/e17_icon_pager.png and b/data/themes/images/e17_icon_pager.png differ