diff --git a/rpcs3/Emu/RSX/GL/GLTexture.cpp b/rpcs3/Emu/RSX/GL/GLTexture.cpp
index 0c32e45d58..4099a35779 100644
--- a/rpcs3/Emu/RSX/GL/GLTexture.cpp
+++ b/rpcs3/Emu/RSX/GL/GLTexture.cpp
@@ -128,7 +128,6 @@ namespace
 		case CELL_GCM_TEXTURE_R5G5B5A1:
 		case CELL_GCM_TEXTURE_R6G5B5:
 		case CELL_GCM_TEXTURE_R5G6B5:
-		//case CELL_GCM_TEXTURE_A4R4G4B4:
 		case CELL_GCM_TEXTURE_A8R8G8B8: // TODO
 		case CELL_GCM_TEXTURE_DEPTH24_D8:
 		case CELL_GCM_TEXTURE_DEPTH24_D8_FLOAT:
@@ -142,7 +141,7 @@ namespace
 			return { GL_ALPHA, GL_RED, GL_GREEN, GL_BLUE };
 
 		case CELL_GCM_TEXTURE_A4R4G4B4:
-			return{ GL_BLUE, GL_GREEN, GL_RED, GL_ALPHA };
+			return { GL_BLUE, GL_GREEN, GL_RED, GL_ALPHA };
 
 		case CELL_GCM_TEXTURE_B8:
 		case CELL_GCM_TEXTURE_X16:
diff --git a/rpcs3/Emu/RSX/VK/VKFormats.cpp b/rpcs3/Emu/RSX/VK/VKFormats.cpp
index 033308d975..6163b89647 100644
--- a/rpcs3/Emu/RSX/VK/VKFormats.cpp
+++ b/rpcs3/Emu/RSX/VK/VKFormats.cpp
@@ -136,12 +136,13 @@ VkComponentMapping get_component_mapping(u32 format, u8 swizzle_mask)
 	case CELL_GCM_TEXTURE_COMPRESSED_R8B8_R8G8:
 		mapping = { VK_COMPONENT_SWIZZLE_A, VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_G, VK_COMPONENT_SWIZZLE_B }; break;
 
-	case CELL_GCM_TEXTURE_B8:
-		mapping = { VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_R }; break;
+	case CELL_GCM_TEXTURE_A4R4G4B4:
+		mapping = { VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_G, VK_COMPONENT_SWIZZLE_B, VK_COMPONENT_SWIZZLE_A }; break;
 
 	case CELL_GCM_TEXTURE_G8B8:
-		mapping = { VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_G, VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_G }; break;
+		mapping = { VK_COMPONENT_SWIZZLE_G, VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_G, VK_COMPONENT_SWIZZLE_R }; break;
 
+	case CELL_GCM_TEXTURE_B8:
 	case CELL_GCM_TEXTURE_X16:
 	case CELL_GCM_TEXTURE_X32_FLOAT:
 		mapping = { VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_R }; break;
@@ -153,10 +154,7 @@ VkComponentMapping get_component_mapping(u32 format, u8 swizzle_mask)
 	case CELL_GCM_TEXTURE_W16_Z16_Y16_X16_FLOAT:
 	case CELL_GCM_TEXTURE_W32_Z32_Y32_X32_FLOAT:
 		mapping = { VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_A, VK_COMPONENT_SWIZZLE_B, VK_COMPONENT_SWIZZLE_G }; break;
-		
-	case CELL_GCM_TEXTURE_A4R4G4B4:
-		mapping = { VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_G, VK_COMPONENT_SWIZZLE_B, VK_COMPONENT_SWIZZLE_A }; break;
-		
+				
 	case CELL_GCM_TEXTURE_D8R8G8B8:
 	case CELL_GCM_TEXTURE_D1R5G5B5:
 		mapping = { VK_COMPONENT_SWIZZLE_ONE, VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_G, VK_COMPONENT_SWIZZLE_B }; break;
@@ -169,7 +167,6 @@ VkComponentMapping get_component_mapping(u32 format, u8 swizzle_mask)
 	case ~(CELL_GCM_TEXTURE_LN | CELL_GCM_TEXTURE_UN) & CELL_GCM_TEXTURE_COMPRESSED_R8B8_R8G8:
 		mapping = { VK_COMPONENT_SWIZZLE_ZERO, VK_COMPONENT_SWIZZLE_G, VK_COMPONENT_SWIZZLE_B, VK_COMPONENT_SWIZZLE_R }; break;
 
-
 	case CELL_GCM_TEXTURE_A8R8G8B8:
 		mapping = { VK_COMPONENT_SWIZZLE_B, VK_COMPONENT_SWIZZLE_G, VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_A }; break;