--- a/Engine/Engine.cpp	Mon Mar 07 03:48:40 2016 +0200
+++ b/Engine/Engine.cpp	Wed Mar 09 01:39:52 2016 +0200
@@ -15,7 +15,6 @@
 #include "Engine/LuaVM.h"
 #include "Engine/MMT.h"
 #include "Engine/SaveLoad.h"
-#include "Engine/Registry.h"
 #include "Engine/Graphics/Vis.h"
 #include "Engine/Graphics/Weather.h"
 #include "Engine/Graphics/LightmapBuilder.h"
@@ -961,13 +960,11 @@
     static_assert(sizeof(ObjectDesc_mm6) == 52, "Wrong type size");
     static_assert(sizeof(ObjectDesc) == 56, "Wrong type size");
     static_assert(sizeof(DecorationDesc) == 84, "Wrong type size");
-    static_assert(sizeof(IconFrame) == 32, "Wrong type size");
     static_assert(sizeof(PlayerFrame) == 10, "Wrong type size");
     static_assert(sizeof(TextureFrame) == 20, "Wrong type size");
     static_assert(sizeof(SpriteFrame) == 60, "Wrong type size");
     static_assert(sizeof(RenderVertexSoft) == 0x30, "Wrong type size");
     static_assert(sizeof(RenderBillboard) == 0x34, "Wrong type size");
-    static_assert(sizeof(Texture_MM7) == 0x48, "Wrong type size");
     //static_assert(sizeof(RGBTexture) == 0x28, "Wrong type size");
     //static_assert(sizeof(LODFile_IconsBitmaps) == 0x11BB8 + 4, "Wrong type size"); // + virtual dtor ptr
     static_assert(sizeof(AudioPlayer) == 0xC84, "Wrong type size");
@@ -998,7 +995,7 @@
     static_assert(sizeof(Actor) == 0x344, "Wrong type size");
     static_assert(sizeof(LevelDecoration) == 0x20, "Wrong type size");
     static_assert(sizeof(KeyboardActionMapping) == 0x20C, "Wrong type size");
-    static_assert(sizeof(UIAnimation) == 0xD, "Wrong type size");
+    //static_assert(sizeof(UIAnimation) == 0xD, "Wrong type size");
     //static_assert(sizeof(SpawnPointMM7) == 0x18, "Wrong type size");
     static_assert(sizeof(ODMFace) == 0x134, "Wrong type size");
     static_assert(sizeof(BSPNode) == 0x8, "Wrong type size");
@@ -1692,8 +1689,9 @@
             { 606, 0, 0, 0 }
         };
 
-        pUIAnims[i]->uIconID = pIconsFrameTable->FindIcon(pUIAnimNames[i]);
-        pIconsFrameTable->InitializeAnimation(pUIAnims[i]->uIconID);
+        //pUIAnims[i]->uIconID = pIconsFrameTable->FindIcon(pUIAnimNames[i]);
+        pUIAnims[i]->icon = pIconsFrameTable->GetIcon(pUIAnimNames[i]);
+        pIconsFrameTable->InitializeAnimation(pUIAnims[i]->icon->id);
 
         pUIAnims[i]->uAnimLength = 0;
         pUIAnims[i]->uAnimTime = 0;