diff --git a/gfx/gfx_thumbnail.h b/gfx/gfx_thumbnail.h
index 0c2283c3d0..3f1808974c 100644
--- a/gfx/gfx_thumbnail.h
+++ b/gfx/gfx_thumbnail.h
@@ -66,12 +66,12 @@ enum gfx_thumbnail_shadow_type
  * an entry thumbnail */
 typedef struct
 {
-   enum gfx_thumbnail_status status;
    uintptr_t texture;
    unsigned width;
    unsigned height;
    float alpha;
    float delay_timer;
+   enum gfx_thumbnail_status status;
    bool fade_active;
 } gfx_thumbnail_t;
 
@@ -79,23 +79,35 @@ typedef struct
  * with a thumbnail shadow effect */
 typedef struct
 {
-   enum gfx_thumbnail_shadow_type type;
+   struct
+   {
+      unsigned width;
+   } outline;
    float alpha;
    struct
    {
       float x_offset;
       float y_offset;
    } drop;
-   struct
-   {
-      unsigned width;
-   } outline;
+   enum gfx_thumbnail_shadow_type type;
 } gfx_thumbnail_shadow_t;
 
 /* Structure containing all gfx_thumbnail
  * global variables */
 struct gfx_thumbnail_state
 {
+   /* Due to the asynchronous nature of thumbnail
+    * loading, it is quite possible to trigger a load
+    * then navigate to a different menu list before
+    * the load is complete/handled. As an additional
+    * safety check, we therefore tag the current menu
+    * list with counter value that is incremented whenever
+    * a list is cleared/set. This is sent as userdata when
+    * requesting a thumbnail, and the upload is only
+    * handled if the tag matches the most recent value
+    * at the time when the load completes */
+   uint64_t list_id;
+
    /* When streaming thumbnails, to minimise the processing
     * of unnecessary images (i.e. when scrolling rapidly through
     * playlists), we delay loading until an entry has been on screen
@@ -108,18 +120,6 @@ struct gfx_thumbnail_state
    /* When true, 'fade in' animation will also be
     * triggered for missing thumbnails */
    bool fade_missing;
-
-   /* Due to the asynchronous nature of thumbnail
-    * loading, it is quite possible to trigger a load
-    * then navigate to a different menu list before
-    * the load is complete/handled. As an additional
-    * safety check, we therefore tag the current menu
-    * list with counter value that is incremented whenever
-    * a list is cleared/set. This is sent as userdata when
-    * requesting a thumbnail, and the upload is only
-    * handled if the tag matches the most recent value
-    * at the time when the load completes */
-   uint64_t list_id;
 };
 
 typedef struct gfx_thumbnail_state gfx_thumbnail_state_t;