diff --git a/apps/buffering.c b/apps/buffering.c
index ba613eb..dfc9006 100644
--- a/apps/buffering.c
+++ b/apps/buffering.c
@@ -52,6 +52,9 @@
 #include "bmp.h"
 #include "appevents.h"
 #include "metadata.h"
+#ifdef HAVE_ALBUMART
+#include "albumart.h"
+#endif
 
 #if MEM > 1
 #define GUARD_BUFSIZE   (32*1024)
@@ -852,8 +855,13 @@ static int load_bitmap(int fd)
     bmp->maskdata = NULL;
 #endif
 
-    int free = (int)MIN(buffer_len - BUF_USED, buffer_len - buf_widx);
-    rc = read_bmp_fd(fd, bmp, free, FORMAT_ANY|FORMAT_DITHER);
+    int free = (int)MIN(buffer_len - BUF_USED, buffer_len - buf_widx)
+                               - sizeof(struct bitmap);
+
+    get_albumart_size(bmp);
+
+    rc = read_bmp_fd(fd, bmp, free, FORMAT_NATIVE|FORMAT_DITHER|
+                     FORMAT_RESIZE|FORMAT_KEEP_ASPECT);
     return rc + (rc > 0 ? sizeof(struct bitmap) : 0);
 }
 #endif
diff --git a/apps/gui/gwps.h b/apps/gui/gwps.h
index 4cffb0d..6311bc0 100644
--- a/apps/gui/gwps.h
+++ b/apps/gui/gwps.h
@@ -47,13 +47,11 @@
 #define WPS_ALBUMART_CHECK          1      /* WPS contains AA conditional tag */
 #define WPS_ALBUMART_LOAD           2      /* WPS contains AA tag */
 
-#define WPS_ALBUMART_ALIGN_RIGHT    WPS_ALIGN_RIGHT    /* x align:   right */
-#define WPS_ALBUMART_ALIGN_CENTER   WPS_ALIGN_CENTER   /* x/y align: center */
-#define WPS_ALBUMART_ALIGN_LEFT     WPS_ALIGN_LEFT     /* x align:   left */
-#define WPS_ALBUMART_ALIGN_TOP      WPS_ALIGN_RIGHT    /* y align:   top */
-#define WPS_ALBUMART_ALIGN_BOTTOM   WPS_ALIGN_LEFT     /* y align:   bottom */
-#define WPS_ALBUMART_INCREASE       8                  /* increase if smaller */
-#define WPS_ALBUMART_DECREASE       16                 /* decrease if larger */
+#define WPS_ALBUMART_ALIGN_RIGHT    1    /* x align:   right */
+#define WPS_ALBUMART_ALIGN_CENTER   2    /* x/y align: center */
+#define WPS_ALBUMART_ALIGN_LEFT     4    /* x align:   left */
+#define WPS_ALBUMART_ALIGN_TOP      1    /* y align:   top */
+#define WPS_ALBUMART_ALIGN_BOTTOM   4    /* y align:   bottom */
 
 #endif /* HAVE_ALBUMART */
 
@@ -382,10 +380,8 @@ struct wps_data
     unsigned char wps_uses_albumart; /* WPS_ALBUMART_NONE, _CHECK, _LOAD */
     short albumart_x;
     short albumart_y;
-    unsigned short albumart_xalign; /* WPS_ALBUMART_ALIGN_LEFT, _CENTER, _RIGHT,
-                                       + .._INCREASE,  + .._DECREASE */
-    unsigned short albumart_yalign; /* WPS_ALBUMART_ALIGN_TOP, _CENTER, _BOTTOM,
-                                       + .._INCREASE,  + .._DECREASE */
+    unsigned char albumart_xalign; /* WPS_ALBUMART_ALIGN_LEFT, _CENTER, _RIGHT */
+    unsigned char albumart_yalign; /* WPS_ALBUMART_ALIGN_TOP, _CENTER, _BOTTOM */
     short albumart_max_width;
     short albumart_max_height;
 
diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c
index e66543d..3471ef6 100644
--- a/apps/gui/wps_parser.c
+++ b/apps/gui/wps_parser.c
@@ -969,23 +969,15 @@ static int parse_albumart_load(const char *wps_bufptr,
 {
     const char *_pos, *newline;
     bool parsing;
-    const short xalign_mask = WPS_ALBUMART_ALIGN_LEFT |
-                              WPS_ALBUMART_ALIGN_CENTER |
-                              WPS_ALBUMART_ALIGN_RIGHT;
-    const short yalign_mask = WPS_ALBUMART_ALIGN_TOP |
-                              WPS_ALBUMART_ALIGN_CENTER |
-                              WPS_ALBUMART_ALIGN_BOTTOM;
-
     (void)token; /* silence warning */
 
     /* reset albumart info in wps */
-    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 */
 
-    /* format: %Cl|x|y|[[l|c|r][d|i|s]mwidth]|[[t|c|b][d|i|s]mheight]| */
+    /* format: %Cl|x|y|[[l|c|r]mwidth]|[[t|c|b]mheight]| */
 
     newline = strchr(wps_bufptr, '\n');
 
@@ -1020,35 +1012,24 @@ static int parse_albumart_load(const char *wps_bufptr,
             case 'l':
             case 'L':
             case '+':
-                wps_data->albumart_xalign =
-                    (wps_data->albumart_xalign & xalign_mask) |
-                    WPS_ALBUMART_ALIGN_LEFT;
+                wps_data->albumart_xalign = WPS_ALBUMART_ALIGN_LEFT;
                 break;
             case 'c':
             case 'C':
-                wps_data->albumart_xalign =
-                    (wps_data->albumart_xalign & xalign_mask) |
-                    WPS_ALBUMART_ALIGN_CENTER;
+                wps_data->albumart_xalign = WPS_ALBUMART_ALIGN_CENTER;
                 break;
             case 'r':
             case 'R':
             case '-':
-                wps_data->albumart_xalign =
-                    (wps_data->albumart_xalign & xalign_mask) |
-                    WPS_ALBUMART_ALIGN_RIGHT;
+                wps_data->albumart_xalign = WPS_ALBUMART_ALIGN_RIGHT;
                 break;
             case 'd':
             case 'D':
-                wps_data->albumart_xalign |= WPS_ALBUMART_DECREASE;
-                break;
             case 'i':
             case 'I':
-                wps_data->albumart_xalign |= WPS_ALBUMART_INCREASE;
-                break;
             case 's':
             case 'S':
-                wps_data->albumart_xalign |=
-                    (WPS_ALBUMART_DECREASE | WPS_ALBUMART_INCREASE);
+                /* simply ignored */
                 break;
             default:
                 parsing = false;
@@ -1080,35 +1061,24 @@ static int parse_albumart_load(const char *wps_bufptr,
             case 't':
             case 'T':
             case '-':
-                wps_data->albumart_yalign =
-                    (wps_data->albumart_yalign & yalign_mask) |
-                    WPS_ALBUMART_ALIGN_TOP;
+                wps_data->albumart_yalign = WPS_ALBUMART_ALIGN_TOP;
                 break;
             case 'c':
             case 'C':
-                wps_data->albumart_yalign =
-                    (wps_data->albumart_yalign & yalign_mask) |
-                    WPS_ALBUMART_ALIGN_CENTER;
+                wps_data->albumart_yalign = WPS_ALBUMART_ALIGN_CENTER;
                 break;
             case 'b':
             case 'B':
             case '+':
-                wps_data->albumart_yalign =
-                    (wps_data->albumart_yalign & yalign_mask) |
-                    WPS_ALBUMART_ALIGN_BOTTOM;
+                wps_data->albumart_yalign = WPS_ALBUMART_ALIGN_BOTTOM;
                 break;
             case 'd':
             case 'D':
-                wps_data->albumart_yalign |= WPS_ALBUMART_DECREASE;
-                break;
             case 'i':
             case 'I':
-                wps_data->albumart_yalign |= WPS_ALBUMART_INCREASE;
-                break;
             case 's':
             case 'S':
-                wps_data->albumart_yalign |=
-                    (WPS_ALBUMART_DECREASE | WPS_ALBUMART_INCREASE);
+                /* simply ignored */
                 break;
             default:
                 parsing = false;
@@ -1524,9 +1494,6 @@ static void wps_reset(struct wps_data *data)
     bool rwps = data->remote_wps; /* remember whether the data is for a RWPS */
 #endif
     memset(data, 0, sizeof(*data));
-#ifdef HAVE_ALBUMART
-    data->wps_uses_albumart = WPS_ALBUMART_NONE;
-#endif
     wps_data_init(data);
 #ifdef HAVE_REMOTE_LCD
     data->remote_wps = rwps;
@@ -1617,6 +1584,14 @@ bool wps_data_load(struct wps_data *wps_data,
                    const char *buf,
                    bool isfile)
 {
+#ifdef HAVE_ALBUMART
+    struct mp3entry *curtrack;
+    long offset;
+    int status;
+    int wps_uses_albumart = wps_data->wps_uses_albumart;
+    int albumart_max_height = wps_data->albumart_max_height;
+    int albumart_max_width = wps_data->albumart_max_width;
+#endif
     if (!wps_data || !buf)
         return false;
 
@@ -1732,6 +1707,21 @@ bool wps_data_load(struct wps_data *wps_data,
             return false;
         }
 #endif
+#ifdef HAVE_ALBUMART
+        status = audio_status();
+        if (((!wps_uses_albumart && wps_data->wps_uses_albumart) ||
+            (wps_data->wps_uses_albumart &&
+            (albumart_max_height != wps_data->albumart_max_height ||
+            albumart_max_width != wps_data->albumart_max_width))) &&
+            status & AUDIO_STATUS_PLAY)
+        {
+            curtrack = audio_current_track();
+            offset = curtrack->offset;
+            audio_stop();
+            if (!(status & AUDIO_STATUS_PAUSE))
+                audio_play(offset);
+        }
+#endif
         return true;
     }
 }
diff --git a/apps/recorder/albumart.c b/apps/recorder/albumart.c
index 30a4e0c..babf63e 100644
--- a/apps/recorder/albumart.c
+++ b/apps/recorder/albumart.c
@@ -297,3 +297,12 @@ void draw_album_art(struct gui_wps *gwps, int handle_id, bool clear)
         gwps->display->set_drawmode(DRMODE_SOLID);
     }
 }
+
+void get_albumart_size(struct bitmap *bmp)
+{
+    /* FIXME: What should we do with albumart on remote? */
+    struct wps_data *data = gui_wps[0].data;
+
+    bmp->width = data->albumart_max_width;
+    bmp->height = data->albumart_max_height;
+}
diff --git a/apps/recorder/albumart.h b/apps/recorder/albumart.h
index 52e7c74..ecfdb9c 100644
--- a/apps/recorder/albumart.h
+++ b/apps/recorder/albumart.h
@@ -40,6 +40,8 @@ void draw_album_art(struct gui_wps *gwps, int handle_id, bool clear);
 bool search_albumart_files(const struct mp3entry *id3, const char *size_string,
                            char *buf, int buflen);
 
+void get_albumart_size(struct bitmap *bmp);
+
 #endif /* HAVE_ALBUMART */
 
 #endif /* _ALBUMART_H_ */
diff --git a/apps/settings.c b/apps/settings.c
index 4babe33..df9f88c 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -843,6 +843,10 @@ void settings_apply(bool read_disk)
             global_settings.wps_file[0] != 0xff ) {
             snprintf(buf, sizeof buf, WPS_DIR "/%s.wps",
                     global_settings.wps_file);
+#ifdef HAVE_ALBUMART
+            gui_wps[0].data->wps_uses_albumart = WPS_ALBUMART_NONE;
+#endif
+            wps_data_init(gui_wps[0].data);
             wps_data_load(gui_wps[0].data, &screens[0], buf, true);
         }
         else
@@ -872,6 +876,9 @@ void settings_apply(bool read_disk)
         if ( global_settings.rwps_file[0]) {
             snprintf(buf, sizeof buf, WPS_DIR "/%s.rwps",
                     global_settings.rwps_file);
+#ifdef HAVE_ALBUMART
+            gui_wps[1].data->wps_uses_albumart = WPS_ALBUMART_NONE;
+#endif
             wps_data_load(gui_wps[1].data, &screens[1], buf, true);
         }
         else