diff --git a/drawable_resources/alphabetical_desc.svg b/drawable_resources/alphabetical_desc.svg
index 5dcfe6c492..f9b5133a33 100644
--- a/drawable_resources/alphabetical_desc.svg
+++ b/drawable_resources/alphabetical_desc.svg
@@ -44,27 +44,22 @@
      id="namedview6"
      showgrid="false"
      inkscape:zoom="27.81"
-     inkscape:cx="2.3451996"
+     inkscape:cx="7.0679049"
      inkscape:cy="12"
      inkscape:window-x="-9"
      inkscape:window-y="-9"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg2" />
-  <g
-     id="g4174"
-     transform="matrix(0.92801764,0,0,0.92801764,3.1474097,-0.40986228)"
-     style="fill:#757575;fill-opacity:1">
-    <path
-       inkscape:connector-curvature="0"
-       id="path4"
-       d="m 4.9604453,12.687998 0,1.805869 4.0659743,0 0,0.05724 -4.4906676,6.399939 0,1.190987 7.326878,0 0,-1.815101 -4.4537366,0 0,-0.07571 4.3872636,-6.296537 0,-1.266693 -6.8357117,0 z"
-       style="fill:#757575;fill-opacity:1" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4-2"
-       d="m 6.9569297,2.3102604 -2.9211499,9.4540376 2.2416409,0 0.679509,-2.5536989 2.7328076,0 0.7367497,2.5536989 2.326579,0 -2.9599252,-9.4540376 -2.8362111,0 z m 1.314702,1.539974 0.027698,0 0.2363509,0.9084738 0.2455834,0.9177062 0.5964168,2.0034438 -2.1086935,0 0.566873,-1.9849791 0.2271185,-0.9269383 0.2086535,-0.9177064 z"
-       style="fill:#757575;fill-opacity:1" />
-  </g>
+  <path
+     style="fill:#757575;fill-opacity:1"
+     d="m 7.7507904,1.734489 0,1.675878 3.7732956,0 0,0.05312 -4.1674184,5.939256 0,1.105257 6.7994724,0 0,-1.684446 -4.133147,0 0,-0.07026 4.071458,-5.843297 0,-1.175514 -6.3436606,0 z"
+     id="path4"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#757575;fill-opacity:1"
+     d="M 9.6035632,11.364486 6.8926845,20.138 l 2.0802823,0 0.6305964,-2.369878 2.5360938,0 0.683717,2.369878 2.159106,0 -2.746863,-8.773514 -2.6320538,0 z m 1.2200668,1.429123 0.0257,0 0.219338,0.84308 0.227906,0.851647 0.553485,1.859232 -1.9569049,0 0.5260679,-1.842096 0.21077,-0.860215 0.193634,-0.851648 z"
+     id="path4-2"
+     inkscape:connector-curvature="0" />
   <path
      inkscape:connector-curvature="0"
      d="m 19.12569,12.771205 -1.428741,-0.0014 -0.0086,6.184289 -1.53692,-1.544835 -1.015429,1.013386 3.263957,3.275355 3.275354,-3.263958 -1.013385,-1.015428 -1.544836,1.53692 z"
diff --git a/res/drawable-xxxhdpi/ic_alphabetical_desc.png b/res/drawable-xxxhdpi/ic_alphabetical_desc.png
index 3360abc4f3..a2dc16bfb1 100644
Binary files a/res/drawable-xxxhdpi/ic_alphabetical_desc.png and b/res/drawable-xxxhdpi/ic_alphabetical_desc.png differ
diff --git a/res/layout/sorting_order_fragment.xml b/res/layout/sorting_order_fragment.xml
index 9375a41399..8ea7272afb 100644
--- a/res/layout/sorting_order_fragment.xml
+++ b/res/layout/sorting_order_fragment.xml
@@ -45,6 +45,7 @@
             android:layout_gravity="center_vertical"
             android:layout_marginBottom="@dimen/standard_half_margin"
             android:layout_marginTop="@dimen/standard_half_margin"
+            android:layout_marginRight="@dimen/standard_margin"
             android:layout_weight="1"
             android:ellipsize="middle"
             android:maxLines="1"
@@ -85,6 +86,7 @@
             android:layout_gravity="center_vertical"
             android:layout_marginBottom="@dimen/standard_half_margin"
             android:layout_marginTop="@dimen/standard_half_margin"
+            android:layout_marginRight="@dimen/standard_margin"
             android:layout_weight="1"
             android:ellipsize="middle"
             android:maxLines="1"
@@ -125,6 +127,7 @@
             android:layout_gravity="center_vertical"
             android:layout_marginBottom="@dimen/standard_half_margin"
             android:layout_marginTop="@dimen/standard_half_margin"
+            android:layout_marginRight="@dimen/standard_margin"
             android:layout_weight="1"
             android:ellipsize="middle"
             android:maxLines="1"
diff --git a/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
index db4688e107..28749a76cc 100644
--- a/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -1075,7 +1075,7 @@ public class FileDisplayActivity extends HookActivity
                 sortByName(true);
                 break;
             case SortingOrderDialogFragment.BY_NAME_DESC:
-                sortByDate(false);
+                sortByName(false);
                 break;
             case SortingOrderDialogFragment.BY_MODIFICATION_DATE_ASC:
                 sortByDate(true);