diff --git a/src/loaders/external_png/tvgPngLoader.cpp b/src/loaders/external_png/tvgPngLoader.cpp
index 6c4c8410..49c9f6e8 100644
--- a/src/loaders/external_png/tvgPngLoader.cpp
+++ b/src/loaders/external_png/tvgPngLoader.cpp
@@ -86,10 +86,10 @@ bool PngLoader::read()
 
     if (cs == ColorSpace::ARGB8888 || cs == ColorSpace::ARGB8888S) {
         image->format = PNG_FORMAT_BGRA;
-        surface.cs = ColorSpace::ARGB8888;
+        surface.cs = ColorSpace::ARGB8888S;
     } else {
         image->format = PNG_FORMAT_RGBA;
-        surface.cs = ColorSpace::ABGR8888;
+        surface.cs = ColorSpace::ABGR8888S;
     }
 
     auto buffer = static_cast<png_bytep>(malloc(PNG_IMAGE_SIZE((*image))));
diff --git a/src/loaders/png/tvgPngLoader.cpp b/src/loaders/png/tvgPngLoader.cpp
index 18e0edd8..7910c1a7 100644
--- a/src/loaders/png/tvgPngLoader.cpp
+++ b/src/loaders/png/tvgPngLoader.cpp
@@ -45,7 +45,7 @@ void PngLoader::run(unsigned tid)
     surface.stride = width;
     surface.w = width;
     surface.h = height;
-    surface.cs = ColorSpace::ABGR8888;
+    surface.cs = ColorSpace::ABGR8888S;
     surface.channelSize = sizeof(uint32_t);
 }
 
diff --git a/src/renderer/gl_engine/tvgGlShaderSrc.cpp b/src/renderer/gl_engine/tvgGlShaderSrc.cpp
index 523d36b7..a0b684b6 100644
--- a/src/renderer/gl_engine/tvgGlShaderSrc.cpp
+++ b/src/renderer/gl_engine/tvgGlShaderSrc.cpp
@@ -276,30 +276,24 @@ const char* IMAGE_FRAG_SHADER = TVG_COMPOSE_SHADER(
         int opacity;                                                                        \n
         int dummy;                                                                          \n
     } uColorInfo;                                                                           \n
+                                                                                            \n
     uniform sampler2D uTexture;                                                             \n
-                                                                                            \n
     in vec2 vUV;                                                                            \n
-                                                                                            \n
     out vec4 FragColor;                                                                     \n
                                                                                             \n
     void main() {                                                                           \n
         vec2 uv = vUV;                                                                      \n
         if (uColorInfo.flipY == 1) { uv.y = 1.0 - uv.y; }                                   \n
-                                                                                            \n
         vec4 color = texture(uTexture, uv);                                                 \n
-        vec4 result = color;                                                                \n
-        if (uColorInfo.format == 1) { /* FMT_ARGB8888 */                                    \n
-            result.r = color.b * color.a;                                                   \n
-            result.g = color.g * color.a;                                                   \n
-            result.b = color.r * color.a;                                                   \n
-            result.a = color.a;                                                             \n
-        } else if (uColorInfo.format == 2) { /* FMT_ABGR8888S */                            \n
+        vec4 result;                                                                        \n
+        if (uColorInfo.format == 0) { /* FMT_ABGR8888 */                                    \n
             result = color;                                                                 \n
+        } else if (uColorInfo.format == 1) { /* FMT_ARGB8888 */                             \n
+            result = color.bgra;                                                            \n
+        } else if (uColorInfo.format == 2) { /* FMT_ABGR8888S */                            \n
+            result = vec4(color.rgb * color.a, color.a);                                    \n
         } else if (uColorInfo.format == 3) { /* FMT_ARGB8888S */                            \n
-            result.r = color.b;                                                             \n
-            result.g = color.g;                                                             \n
-            result.b = color.b;                                                             \n
-            result.a = color.a;                                                             \n
+            result = vec4(color.bgr * color.a, color.a);                                    \n
         }                                                                                   \n
         float opacity = float(uColorInfo.opacity) / 255.0;                                  \n
         FragColor = result * opacity;                                                       \n