Index: dll/win32/browseui/CProgressDialog.cpp
===================================================================
--- dll/win32/browseui/CProgressDialog.cpp	(revision 67328)
+++ dll/win32/browseui/CProgressDialog.cpp	(working copy)
@@ -343,6 +343,13 @@
 
 HRESULT WINAPI CProgressDialog::SetAnimation(HINSTANCE hInstance, UINT uiResourceId)
 {
+    HWND hAnimation = GetDlgItem(this->hwnd, IDD_PROGRESS_DLG);
+    SetWindowLongW(hAnimation, GWL_STYLE,
+        GetWindowLongW(hAnimation, GWL_STYLE)|ACS_TRANSPARENT|ACS_CENTER|ACS_AUTOPLAY);
+        
+    if(!Animate_OpenEx(hAnimation,hInstance,MAKEINTRESOURCEW(uiResourceId)))
+        return S_FALSE;
+    
     return S_OK;
 }
 
Index: dll/win32/browseui/lang/bg-BG.rc
===================================================================
--- dll/win32/browseui/lang/bg-BG.rc	(revision 67328)
+++ dll/win32/browseui/lang/bg-BG.rc	(working copy)
@@ -95,11 +95,11 @@
 CAPTION ""
 FONT 8, "MS Shell Dlg"
 {
-    CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */
+    CONTROL "", IDC_ANIMATION, ANIMATE_CLASS, 0, 12, 10, 236, 25 /* TODO: style */
     LTEXT "", IDC_TEXT_LINE,     7, 45, 250, 10, SS_LEFT|SS_NOPREFIX
     LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX
     LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX
-    CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8
+    CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASS, WS_BORDER, 7, 65, 190, 8
     PUSHBUTTON "Cancel", IDCANCEL, 205, 65, 50, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE
 }
 
Index: dll/win32/browseui/lang/de-DE.rc
===================================================================
--- dll/win32/browseui/lang/de-DE.rc	(revision 67328)
+++ dll/win32/browseui/lang/de-DE.rc	(working copy)
@@ -113,11 +113,11 @@
 CAPTION ""
 FONT 8, "MS Shell Dlg"
 {
-    CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */
+    CONTROL "", IDC_ANIMATION, ANIMATE_CLASS, 0, 12, 10, 236, 25 /* TODO: style */
     LTEXT "", IDC_TEXT_LINE,     7, 45, 250, 10, SS_LEFT|SS_NOPREFIX
     LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX
     LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX
-    CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8
+    CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASS, WS_BORDER, 7, 65, 190, 8
     PUSHBUTTON "Abbrechen", IDCANCEL, 205, 65, 50, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE
 }
 
Index: dll/win32/browseui/lang/en-US.rc
===================================================================
--- dll/win32/browseui/lang/en-US.rc	(revision 67328)
+++ dll/win32/browseui/lang/en-US.rc	(working copy)
@@ -113,11 +113,11 @@
 CAPTION ""
 FONT 8, "MS Shell Dlg"
 {
-    CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */
+    CONTROL "", IDC_ANIMATION, ANIMATE_CLASS, 0, 12, 10, 236, 25 /* TODO: style */
     LTEXT "", IDC_TEXT_LINE,     7, 45, 250, 10, SS_LEFT|SS_NOPREFIX
     LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX
     LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX
-    CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8
+    CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASS, WS_BORDER, 7, 65, 190, 8
     PUSHBUTTON "Cancel", IDCANCEL, 205, 65, 50, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE
 }
 
Index: dll/win32/browseui/lang/es-ES.rc
===================================================================
--- dll/win32/browseui/lang/es-ES.rc	(revision 67328)
+++ dll/win32/browseui/lang/es-ES.rc	(working copy)
@@ -96,11 +96,11 @@
 CAPTION ""
 FONT 8, "MS Shell Dlg"
 {
-    CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */
+    CONTROL "", IDC_ANIMATION, ANIMATE_CLASS, 0, 12, 10, 236, 25 /* TODO: style */
     LTEXT "", IDC_TEXT_LINE,     7, 45, 250, 10, SS_LEFT|SS_NOPREFIX
     LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX
     LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX
-    CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8
+    CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASS, WS_BORDER, 7, 65, 190, 8
     PUSHBUTTON "Cancel", IDCANCEL, 205, 65, 50, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE
 }
 
Index: dll/win32/browseui/lang/he-IL.rc
===================================================================
--- dll/win32/browseui/lang/he-IL.rc	(revision 67328)
+++ dll/win32/browseui/lang/he-IL.rc	(working copy)
@@ -97,11 +97,11 @@
 CAPTION ""
 FONT 8, "MS Shell Dlg"
 {
-    CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */
+    CONTROL "", IDC_ANIMATION, ANIMATE_CLASS, 0, 12, 10, 236, 25 /* TODO: style */
     LTEXT "", IDC_TEXT_LINE,     7, 45, 250, 10, SS_LEFT|SS_NOPREFIX
     LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX
     LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX
-    CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8
+    CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASS, WS_BORDER, 7, 65, 190, 8
     PUSHBUTTON "Cancel", IDCANCEL, 205, 65, 50, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE
 }
 
Index: dll/win32/browseui/lang/it-IT.rc
===================================================================
--- dll/win32/browseui/lang/it-IT.rc	(revision 67328)
+++ dll/win32/browseui/lang/it-IT.rc	(working copy)
@@ -95,11 +95,11 @@
 CAPTION ""
 FONT 8, "MS Shell Dlg"
 {
-    CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */
+    CONTROL "", IDC_ANIMATION, ANIMATE_CLASS, 0, 12, 10, 236, 25 /* TODO: style */
     LTEXT "", IDC_TEXT_LINE,     7, 45, 250, 10, SS_LEFT|SS_NOPREFIX
     LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX
     LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX
-    CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8
+    CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASS, WS_BORDER, 7, 65, 190, 8
     PUSHBUTTON "Cancel", IDCANCEL, 205, 65, 50, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE
 }
 
Index: dll/win32/browseui/lang/pl-PL.rc
===================================================================
--- dll/win32/browseui/lang/pl-PL.rc	(revision 67328)
+++ dll/win32/browseui/lang/pl-PL.rc	(working copy)
@@ -103,11 +103,11 @@
 CAPTION ""
 FONT 8, "MS Shell Dlg"
 {
-    CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */
+    CONTROL "", IDC_ANIMATION, ANIMATE_CLASS, 0, 12, 10, 236, 25 /* TODO: style */
     LTEXT "", IDC_TEXT_LINE,     7, 45, 250, 10, SS_LEFT|SS_NOPREFIX
     LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX
     LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX
-    CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8
+    CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASS, WS_BORDER, 7, 65, 190, 8
     PUSHBUTTON "Cancel", IDCANCEL, 205, 65, 50, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE
 }
 
Index: dll/win32/browseui/lang/ro-RO.rc
===================================================================
--- dll/win32/browseui/lang/ro-RO.rc	(revision 67328)
+++ dll/win32/browseui/lang/ro-RO.rc	(working copy)
@@ -97,11 +97,11 @@
 CAPTION ""
 FONT 8, "MS Shell Dlg"
 {
-    CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */
+    CONTROL "", IDC_ANIMATION, ANIMATE_CLASS, 0, 12, 10, 236, 25 /* TODO: style */
     LTEXT "", IDC_TEXT_LINE,     7, 45, 250, 10, SS_LEFT|SS_NOPREFIX
     LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX
     LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX
-    CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8
+    CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASS, WS_BORDER, 7, 65, 190, 8
     PUSHBUTTON "A&nulează", IDCANCEL, 205, 65, 50, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE
 }
 
Index: dll/win32/browseui/lang/ru-RU.rc
===================================================================
--- dll/win32/browseui/lang/ru-RU.rc	(revision 67328)
+++ dll/win32/browseui/lang/ru-RU.rc	(working copy)
@@ -97,11 +97,11 @@
 CAPTION ""
 FONT 8, "MS Shell Dlg"
 {
-    CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */
+    CONTROL "", IDC_ANIMATION, ANIMATE_CLASS, 0, 12, 10, 236, 25 /* TODO: style */
     LTEXT "", IDC_TEXT_LINE,     7, 45, 250, 10, SS_LEFT|SS_NOPREFIX
     LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX
     LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX
-    CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8
+    CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASS, WS_BORDER, 7, 65, 190, 8
     PUSHBUTTON "Отмена", IDCANCEL, 205, 65, 50, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE
 }
 
Index: dll/win32/browseui/lang/sq-AL.rc
===================================================================
--- dll/win32/browseui/lang/sq-AL.rc	(revision 67328)
+++ dll/win32/browseui/lang/sq-AL.rc	(working copy)
@@ -114,11 +114,11 @@
 CAPTION ""
 FONT 8, "MS Shell Dlg"
 {
-    CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */
+    CONTROL "", IDC_ANIMATION, ANIMATE_CLASS, 0, 12, 10, 236, 25 /* TODO: style */
     LTEXT "", IDC_TEXT_LINE,     7, 45, 250, 10, SS_LEFT|SS_NOPREFIX
     LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX
     LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX
-    CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8
+    CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASS, WS_BORDER, 7, 65, 190, 8
     PUSHBUTTON "Cancel", IDCANCEL, 205, 65, 50, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE
 }
 
Index: dll/win32/browseui/lang/tr-TR.rc
===================================================================
--- dll/win32/browseui/lang/tr-TR.rc	(revision 67328)
+++ dll/win32/browseui/lang/tr-TR.rc	(working copy)
@@ -95,11 +95,11 @@
 CAPTION ""
 FONT 8, "MS Shell Dlg"
 {
-    CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */
+    CONTROL "", IDC_ANIMATION, ANIMATE_CLASS, 0, 12, 10, 236, 25 /* TODO: style */
     LTEXT "", IDC_TEXT_LINE,     7, 45, 250, 10, SS_LEFT|SS_NOPREFIX
     LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX
     LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX
-    CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8
+    CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASS, WS_BORDER, 7, 65, 190, 8
     PUSHBUTTON "Cancel", IDCANCEL, 205, 65, 50, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE
 }
 
Index: dll/win32/browseui/lang/uk-UA.rc
===================================================================
--- dll/win32/browseui/lang/uk-UA.rc	(revision 67328)
+++ dll/win32/browseui/lang/uk-UA.rc	(working copy)
@@ -97,11 +97,11 @@
 CAPTION ""
 FONT 8, "MS Shell Dlg"
 {
-    CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */
+    CONTROL "", IDC_ANIMATION, ANIMATE_CLASS, 0, 12, 10, 236, 25 /* TODO: style */
     LTEXT "", IDC_TEXT_LINE,     7, 45, 250, 10, SS_LEFT|SS_NOPREFIX
     LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX
     LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX
-    CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8
+    CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASS, WS_BORDER, 7, 65, 190, 8
     PUSHBUTTON "Cancel", IDCANCEL, 205, 65, 50, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE
 }
 
Index: dll/win32/shell32/shlfileop.cpp
===================================================================
--- dll/win32/shell32/shlfileop.cpp	(revision 67328)
+++ dll/win32/shell32/shlfileop.cpp	(working copy)
@@ -479,6 +479,7 @@
     if (op->progress == NULL)
         return;
     WCHAR szTitle[50], szPreflight[50];
+    UINT animation_id = NULL;
 
     switch (op->req->wFunc)
     {
@@ -485,14 +486,17 @@
         case FO_COPY:
             LoadStringW(shell32_hInstance, IDS_FILEOOP_COPYING, szTitle, sizeof(szTitle)/sizeof(WCHAR));
             LoadStringW(shell32_hInstance, IDS_FILEOOP_FROM_TO, op->szBuilderString, sizeof( op->szBuilderString)/sizeof(WCHAR));
+            animation_id = IDA_SHELL_COPY;
             break;
         case FO_DELETE:
             LoadStringW(shell32_hInstance, IDS_FILEOOP_DELETING, szTitle, sizeof(szTitle)/sizeof(WCHAR));
             LoadStringW(shell32_hInstance, IDS_FILEOOP_FROM, op->szBuilderString, sizeof( op->szBuilderString)/sizeof(WCHAR));
+            animation_id = IDA_SHELL_DELETE;
             break;
         case FO_MOVE:
             LoadStringW(shell32_hInstance, IDS_FILEOOP_MOVING, szTitle, sizeof(szTitle)/sizeof(WCHAR));
             LoadStringW(shell32_hInstance, IDS_FILEOOP_FROM_TO, op->szBuilderString, sizeof( op->szBuilderString)/sizeof(WCHAR));
+            animation_id = IDA_SHELL_COPY;
             break;
         default:
             return;
@@ -501,6 +505,7 @@
 
     op->progress->SetTitle(szTitle);
     op->progress->SetLine(1, szPreflight, false, NULL);
+    op->progress->SetAnimation(shell32_hInstance, animation_id);
 }
 
 static void _SetOperationTexts(FILE_OPERATION *op, LPCWSTR src, LPCWSTR dest) {
Index: dll/win32/shell32/shresdef.h
===================================================================
--- dll/win32/shell32/shresdef.h	(revision 67328)
+++ dll/win32/shell32/shresdef.h	(working copy)
@@ -487,17 +487,19 @@
  * AVI resources
  *
  * windows shell32 has 14 of them: 150-152 and 160-170
- * FIXME: Need to add them, but for now just let them use the same: searching.avi
- * (also to limit shell32's size)
+ * FIXME: Add 150-152
  */
-#define IDR_AVI_SEARCH       150
-#define IDR_AVI_SEARCHING    151
-#define IDR_AVI_FINDCOMPUTER 152
-#define IDR_AVI_FILEMOVE     160
-#define IDR_AVI_FILECOPY     161
-#define IDR_AVI_FILENUKE     163
-#define IDR_AVI_FILEDELETE   164
 
+#define IDA_SHELL_COPY 160
+#define IDA_SHELL_COPY1 161
+#define IDA_SHELL_COPY2 167
+#define IDA_SHELL_COPY3 168
+#define IDA_SHELL_RECYCLE 162
+#define IDA_SHELL_EMPTY_RECYCLE 163
+#define IDA_SHELL_DELETE 164
+#define IDA_SHELL_DELETE1 169
+#define IDA_SHELL_DOWNLOAD 170
+
 /* Desktop Browser commands */
 #define FCIDM_DESKBROWSER_CLOSE      0xA004
 #define FCIDM_DESKBROWSER_FOCUS      0xA030