Index: apps/gui/wps_parser.c
===================================================================
--- apps/gui/wps_parser.c	(revision 16170)
+++ apps/gui/wps_parser.c	(working copy)
@@ -660,8 +660,10 @@ static int parse_albumart_load(const cha
     wps_data->wps_uses_albumart = WPS_ALBUMART_NONE;
     wps_data->albumart_max_width = -1;
     wps_data->albumart_max_height = -1;
-    wps_data->albumart_xalign = WPS_ALBUMART_ALIGN_CENTER; /* default */
-    wps_data->albumart_yalign = WPS_ALBUMART_ALIGN_CENTER; /* default */
+    wps_data->albumart_xalign = WPS_ALBUMART_ALIGN_CENTER | 
+                               (WPS_ALBUMART_DECREASE | WPS_ALBUMART_INCREASE); /* default */
+    wps_data->albumart_yalign = WPS_ALBUMART_ALIGN_CENTER |
+                               (WPS_ALBUMART_DECREASE | WPS_ALBUMART_INCREASE); /* default */
 
     /* format: %Cl|x|y|[[l|c|r][d|i|s]mwidth]|[[t|c|b][d|i|s]mheight]| */
 
@@ -717,11 +719,15 @@ static int parse_albumart_load(const cha
                 break;
             case 'd':
             case 'D':
-                wps_data->albumart_xalign |= WPS_ALBUMART_DECREASE;
+                wps_data->albumart_xalign =
+                    (wps_data->albumart_xalign & xalign_mask) |
+                    WPS_ALBUMART_DECREASE;
                 break;
             case 'i':
             case 'I':
-                wps_data->albumart_xalign |= WPS_ALBUMART_INCREASE;
+                wps_data->albumart_xalign =
+                    (wps_data->albumart_xalign & xalign_mask) |
+                    WPS_ALBUMART_INCREASE;
                 break;
             case 's':
             case 'S':
@@ -777,11 +783,15 @@ static int parse_albumart_load(const cha
                 break;
             case 'd':
             case 'D':
-                wps_data->albumart_yalign |= WPS_ALBUMART_DECREASE;
+                wps_data->albumart_yalign =
+                    (wps_data->albumart_yalign & yalign_mask) |
+                    WPS_ALBUMART_DECREASE;
                 break;
             case 'i':
             case 'I':
-                wps_data->albumart_yalign |= WPS_ALBUMART_INCREASE;
+                wps_data->albumart_yalign =
+                    (wps_data->albumart_yalign & yalign_mask) |
+                    WPS_ALBUMART_INCREASE;
                 break;
             case 's':
             case 'S':