diff --git a/tools/dmitool/dmitool.jar b/tools/dmitool/dmitool.jar
index 4cfa49f36de..3e99778951d 100644
Binary files a/tools/dmitool/dmitool.jar and b/tools/dmitool/dmitool.jar differ
diff --git a/tools/dmitool/src/main/java/dmitool/IconState.java b/tools/dmitool/src/main/java/dmitool/IconState.java
index 2a2202c71cd..a214f5d621a 100644
--- a/tools/dmitool/src/main/java/dmitool/IconState.java
+++ b/tools/dmitool/src/main/java/dmitool/IconState.java
@@ -189,6 +189,7 @@ public class IconState {
             px[i] = sl.clone();
         }
         
+        int channelCount = in.imgInfo.alpha ? 4 : 3;
         Image[] images = new Image[frames*dirs];
         for(int imageY=0; imageY<dirs; imageY++) {
             for(int imageX=0; imageX<frames; imageX++) {
@@ -196,11 +197,11 @@ public class IconState {
                 for(int pixelY=0; pixelY<h; pixelY++) {
                     for(int pixelX=0; pixelX<w; pixelX++) {
                         int bY = imageY*h + pixelY;
-                        int bX = imageX*4*w + 4*pixelX;
+                        int bX = imageX*channelCount*w + channelCount*pixelX;
                         pixels[pixelY][pixelX] = new RGBA(px[bY][bX    ],
                                                           px[bY][bX + 1],
                                                           px[bY][bX + 2],
-                                                          px[bY][bX + 3]);
+                                                          in.imgInfo.alpha ? px[bY][bX + 3] : 255);
                     }
                 }
                 images[_getIndex(imageY, imageX, dirs)] = new NonPalettedImage(w, h, pixels);