diff --git a/themes/clear/theme.css b/themes/clear/theme.css
index 258d8b57c..1630bbdd6 100644
--- a/themes/clear/theme.css
+++ b/themes/clear/theme.css
@@ -14,12 +14,12 @@ H2, #menubar DT, #imageHeaderBar, #imageToolBar A:hover {
 	background-color: #d3d3d3;
 }
 
-#menubar DL, .content, #imageToolBar, #derivativeSwitchLink, #derivativeSwitchBox, .header_notes {
+#menubar DL, .content, #imageToolBar, #derivativeSwitchLink, #derivativeSwitchBox, #sortOrderBox, .header_notes {
   background-color: #eeeeee;
 }
 
 /* borders */
-#menubar DL, .content, #imageToolBar, #derivativeSwitchLink, #derivativeSwitchBox {
+#menubar DL, .content, #imageToolBar, #derivativeSwitchLink, #derivativeSwitchBox, #sortOrderBox {
   border: 1px solid #d3d3d3;
 }
 
diff --git a/themes/dark/theme.css b/themes/dark/theme.css
index eca78dc9a..3ff836163 100644
--- a/themes/dark/theme.css
+++ b/themes/dark/theme.css
@@ -16,7 +16,7 @@ BODY, H3, #imageToolBar A:hover {
 	background-color: #2f2f2f;
 }
 
-#menubar DL, .content, #imageToolBar, #imageHeaderBar, #derivativeSwitchLink, #derivativeSwitchBox, .header_notes {
+#menubar DL, .content, #imageToolBar, #imageHeaderBar, #derivativeSwitchLink, #derivativeSwitchBox, #sortOrderBox, .header_notes {
 	background-color: #505050;
 }
 
@@ -34,7 +34,7 @@ H2, #menubar DT {
 }
 
 /* borders */
-#menubar DL, .content, #derivativeSwitchLink, #derivativeSwitchBox{
+#menubar DL, .content, #derivativeSwitchLink, #derivativeSwitchBox, #sortOrderBox{
 	border: 1px solid #000;
 }
 
diff --git a/themes/default/iconset.css b/themes/default/iconset.css
index ab53b9fd1..976f2ce0f 100644
--- a/themes/default/iconset.css
+++ b/themes/default/iconset.css
@@ -36,6 +36,7 @@
 
 .pwg-icon-close {background-position: 0 -52px}
 .pwg-icon-category-edit {background-position: -26px -52px}
+.pwg-icon-sort {background-position: -52px -52px}
 .pwg-icon-category-view-normal {background-position: -156px -52px}
 .pwg-icon-category-view-flat {background-position: -182px -52px}
 
diff --git a/themes/default/s26/outline_005e89.png b/themes/default/s26/outline_005e89.png
index 1097a5242..0e411a152 100644
Binary files a/themes/default/s26/outline_005e89.png and b/themes/default/s26/outline_005e89.png differ
diff --git a/themes/default/s26/outline_808060.png b/themes/default/s26/outline_808060.png
index 4cfb932fe..01d1f18df 100644
Binary files a/themes/default/s26/outline_808060.png and b/themes/default/s26/outline_808060.png differ
diff --git a/themes/default/s26/outline_808080.png b/themes/default/s26/outline_808080.png
index 4cac9ecbb..d51b3b44c 100644
Binary files a/themes/default/s26/outline_808080.png and b/themes/default/s26/outline_808080.png differ
diff --git a/themes/default/s26/outline_ff3363.png b/themes/default/s26/outline_ff3363.png
index 5db5cce9a..9a5aef891 100644
Binary files a/themes/default/s26/outline_ff3363.png and b/themes/default/s26/outline_ff3363.png differ
diff --git a/themes/default/s26/outline_ff7700.png b/themes/default/s26/outline_ff7700.png
index 4e07b085f..45caa0dc3 100644
Binary files a/themes/default/s26/outline_ff7700.png and b/themes/default/s26/outline_ff7700.png differ
diff --git a/themes/default/s26/outline_ffff80.png b/themes/default/s26/outline_ffff80.png
index 209a3dd52..0f54e2e46 100644
Binary files a/themes/default/s26/outline_ffff80.png and b/themes/default/s26/outline_ffff80.png differ
diff --git a/themes/default/s26/outline_ffffff.png b/themes/default/s26/outline_ffffff.png
index d27b992fa..338aa82b5 100644
Binary files a/themes/default/s26/outline_ffffff.png and b/themes/default/s26/outline_ffffff.png differ
diff --git a/themes/default/template/index.tpl b/themes/default/template/index.tpl
index 815dcbd8e..5af08ba6d 100644
--- a/themes/default/template/index.tpl
+++ b/themes/default/template/index.tpl
@@ -4,13 +4,36 @@
 <div class="titrePage">
 	<ul class="categoryActions">
 {if !empty($image_orders)}
-		<li>{'Sort order'|@translate}: {strip}
-		<select onchange="document.location = this.options[this.selectedIndex].value;">
-			{foreach from=$image_orders item=image_order}
-			<option value="{$image_order.URL}"{if $image_order.SELECTED} selected="selected"{/if}>{$image_order.DISPLAY}</option>
+		<li>{strip}<a href="javascript:toggleSortOrderBox()" id="sortOrderLink" title="{'Sort order'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
+			<span class="pwg-icon pwg-icon-sort">&nbsp;</span><span class="pwg-button-text">{'Sort order'|@translate}</span>
+		</a>
+		<div id="sortOrderBox" style="display:none; text-align:left" onclick="toggleSortOrderBox()">
+			{'Sort order'|@translate}:
+			{foreach from=$image_orders item=image_order}<br>
+			{if $image_order.SELECTED}
+			<span>{$image_order.DISPLAY}</span>
+			{else}
+			<a href="{$image_order.URL}" rel="nofollow">{$image_order.DISPLAY}</a>
+			{/if}
 			{/foreach}
-		</select>
-{/strip}</li>
+		</div>
+		{footer_script}{literal}
+function toggleSortOrderBox()
+{
+	var elt = document.getElementById("sortOrderBox"),
+		ePos = document.getElementById("sortOrderLink");
+	if (elt.style.display==="none")
+	{
+		elt.style.position = "absolute";
+		elt.style.left = (ePos.offsetLeft) + "px";
+		elt.style.top = (ePos.offsetTop + ePos.offsetHeight) + "px";
+		elt.style.display="";
+	}
+	else
+		elt.style.display="none";
+}
+		{/literal}{/footer_script}
+		{/strip}</li>
 {/if}
 {if isset($favorite)}
 		<li><a href="{$favorite.U_FAVORITE}" title="{'delete all photos from your favorites'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
diff --git a/themes/default/theme.css b/themes/default/theme.css
index dfdb2f40e..d3d6e9475 100644
--- a/themes/default/theme.css
+++ b/themes/default/theme.css
@@ -345,8 +345,8 @@ TD.calDayHead {
 	top: 100px;
 }
 
-#derivativeSwitchBox {
-	padding: 0.5em;
+#derivativeSwitchBox, #sortOrderBox {
+	padding: 0.5em 1em;
 	border-radius: 4px;
 	z-index: 100;
 }