diff --git a/main/css/academica/default.css b/main/css/academica/default.css
index 61602de7c7..e4d7e8cdab 100644
--- a/main/css/academica/default.css
+++ b/main/css/academica/default.css
@@ -1829,17 +1829,17 @@ button:hover {
 	border-style: inset;
 }
 /* button with image */
-button.add, button.save, button.cancel, button.search, button.login, button.plus, button.minus, button.next, button.back {
+button.add, button.save, button.cancel, button.refresh, button.upload, button.search, button.login, button.plus, button.minus, button.next, button.back {
 	padding-left:30px;
 	background-position:10px;
 	background-repeat:no-repeat;
 }
 /* POSITIVE */
-button.save, button.add, button.search, button.login, button.plus, button.minus, button.next, button.back {
+button.save, button.add, button.search, button.refresh, button.upload, button.login, button.plus, button.minus, button.next, button.back {
 	background-color:#E5EDF9;
 	border-color: #D4E2F6;
 }
-button.save:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
+button.save:hover, button.refresh:hover, button.upload:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
 	border-color: #D4E2F6;
 	background-color:#D4E2F6;
 }
@@ -1871,6 +1871,7 @@ button.search {
 /*including "login" image*/
 button.login {
 	background-image:url(images/button_login.gif);
+	margin:2px 5px 3px 5px !important;
 }
 /*including "plus" image*/
 button.plus {
@@ -1888,6 +1889,15 @@ button.next {
 button.back {
 	background-image:url(images/button_back.gif);
 }
+/*including "refresh" image*/
+button.refresh {
+    background-image:url(images/button_refresh.gif);
+}
+/*including "upload" image*/
+button.upload {
+    background-image:url(images/button_upload.gif);
+}
+
 .icon_image_content {
 	width:70px;
 	cursor:hand;
diff --git a/main/css/academica/images/button_refresh.gif b/main/css/academica/images/button_refresh.gif
new file mode 100644
index 0000000000..8268958a19
Binary files /dev/null and b/main/css/academica/images/button_refresh.gif differ
diff --git a/main/css/academica/images/button_upload.gif b/main/css/academica/images/button_upload.gif
new file mode 100644
index 0000000000..3d91ac4404
Binary files /dev/null and b/main/css/academica/images/button_upload.gif differ
diff --git a/main/css/baby_orange/default.css b/main/css/baby_orange/default.css
index 5aad0c99fb..7fc1385e0a 100644
--- a/main/css/baby_orange/default.css
+++ b/main/css/baby_orange/default.css
@@ -1827,17 +1827,17 @@ button:hover {
 	border-style: inset;
 }
 /* button with image */
-button.add, button.save, button.cancel, button.search, button.login, button.plus, button.minus, button.next, button.back {
+button.add, button.save, button.cancel, button.refresh, button.upload, button.search, button.login, button.plus, button.minus, button.next, button.back {
 	padding-left:30px;
 	background-position:10px;
 	background-repeat:no-repeat;
 }
 /* POSITIVE */
-button.save, button.add, button.search, button.login, button.plus, button.minus, button.next, button.back {
+button.save, button.add, button.search, button.refresh, button.upload, button.login, button.plus, button.minus, button.next, button.back {
 	background-color:#E5EDF9;
 	border-color: #D4E2F6;
 }
-button.save:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
+button.save:hover, button.refresh:hover, button.upload:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
 	border-color: #D4E2F6;
 	background-color:#D4E2F6;
 }
@@ -1869,6 +1869,7 @@ button.search {
 /*including "login" image*/
 button.login {
 	background-image:url(images/button_login.gif);
+	margin:2px 5px 3px 5px !important;
 }
 /*including "plus" image*/
 button.plus {
@@ -1886,6 +1887,15 @@ button.next {
 button.back {
 	background-image:url(images/button_back.gif);
 }
+/*including "refresh" image*/
+button.refresh {
+    background-image:url(images/button_refresh.gif);
+}
+/*including "upload" image*/
+button.upload {
+    background-image:url(images/button_upload.gif);
+}
+
 .icon_image_content {
 	width:70px;
 	cursor:hand;
diff --git a/main/css/baby_orange/images/button_refresh.gif b/main/css/baby_orange/images/button_refresh.gif
new file mode 100644
index 0000000000..8268958a19
Binary files /dev/null and b/main/css/baby_orange/images/button_refresh.gif differ
diff --git a/main/css/baby_orange/images/button_upload.gif b/main/css/baby_orange/images/button_upload.gif
new file mode 100644
index 0000000000..3d91ac4404
Binary files /dev/null and b/main/css/baby_orange/images/button_upload.gif differ
diff --git a/main/css/blue_lagoon/default.css b/main/css/blue_lagoon/default.css
index 4f5cc214dd..010f26e0a5 100644
--- a/main/css/blue_lagoon/default.css
+++ b/main/css/blue_lagoon/default.css
@@ -2276,19 +2276,19 @@ button:hover {
 	border-style: inset;
 }
 /* button with image */
-button.add, button.save, button.cancel, button.search, button.login, button.plus, button.minus, button.next, button.back {
+button.add, button.save, button.cancel, button.refresh, button.upload, button.search, button.login, button.plus, button.minus, button.next, button.back {
 	padding-left:30px;
 	background-position:10px;
 	background-repeat:no-repeat;
 }
 /* POSITIVE */
-button.save, button.add, button.search, button.login, button.plus, button.minus, button.next, button.back {
-	background-color:#ddd;
+button.save, button.add, button.search, button.refresh, button.upload, button.login, button.plus, button.minus, button.next, button.back {
+	background-color:#E5EDF9;
 	border-color: #D4E2F6;
 }
-button.save:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
+button.save:hover, button.refresh:hover, button.upload:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
 	border-color: #D4E2F6;
-	background-color:#efefef;
+	background-color:#D4E2F6;
 }
 /* NEGATIVE */
 button.cancel {
@@ -2318,6 +2318,7 @@ button.search {
 /*including "login" image*/
 button.login {
 	background-image:url(images/button_login.gif);
+	margin:2px 5px 3px 5px !important;
 }
 /*including "plus" image*/
 button.plus {
@@ -2335,6 +2336,15 @@ button.next {
 button.back {
 	background-image:url(images/button_back.gif);
 }
+/*including "refresh" image*/
+button.refresh {
+    background-image:url(images/button_refresh.gif);
+}
+/*including "upload" image*/
+button.upload {
+    background-image:url(images/button_upload.gif);
+}
+
 .icon_image_content {
 	width:70px;
 	height:5em;
diff --git a/main/css/blue_lagoon/images/button_refresh.gif b/main/css/blue_lagoon/images/button_refresh.gif
new file mode 100644
index 0000000000..8268958a19
Binary files /dev/null and b/main/css/blue_lagoon/images/button_refresh.gif differ
diff --git a/main/css/blue_lagoon/images/button_upload.gif b/main/css/blue_lagoon/images/button_upload.gif
new file mode 100644
index 0000000000..3d91ac4404
Binary files /dev/null and b/main/css/blue_lagoon/images/button_upload.gif differ
diff --git a/main/css/cool_blue/default.css b/main/css/cool_blue/default.css
index 75aa477e91..6dc3a1855c 100644
--- a/main/css/cool_blue/default.css
+++ b/main/css/cool_blue/default.css
@@ -2277,19 +2277,19 @@ button:hover {
 	border-style: inset;
 }
 /* button with image */
-button.add, button.save, button.cancel, button.search, button.login, button.plus, button.minus, button.next, button.back {
+button.add, button.save, button.cancel, button.refresh, button.upload, button.search, button.login, button.plus, button.minus, button.next, button.back {
 	padding-left:30px;
 	background-position:10px;
 	background-repeat:no-repeat;
 }
 /* POSITIVE */
-button.save, button.add, button.search, button.login, button.plus, button.minus, button.next, button.back {
-	background-color:#ddd;
+button.save, button.add, button.search, button.refresh, button.upload, button.login, button.plus, button.minus, button.next, button.back {
+	background-color:#E5EDF9;
 	border-color: #D4E2F6;
 }
-button.save:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
+button.save:hover, button.refresh:hover, button.upload:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
 	border-color: #D4E2F6;
-	background-color:#efefef;
+	background-color:#D4E2F6;
 }
 /* NEGATIVE */
 button.cancel {
@@ -2319,6 +2319,7 @@ button.search {
 /*including "login" image*/
 button.login {
 	background-image:url(images/button_login.gif);
+	margin:2px 5px 3px 5px !important;
 }
 /*including "plus" image*/
 button.plus {
@@ -2336,6 +2337,15 @@ button.next {
 button.back {
 	background-image:url(images/button_back.gif);
 }
+/*including "refresh" image*/
+button.refresh {
+    background-image:url(images/button_refresh.gif);
+}
+/*including "upload" image*/
+button.upload {
+    background-image:url(images/button_upload.gif);
+}
+
 .icon_image_content {
 	width:70px;
 	height:5em;
diff --git a/main/css/cool_blue/images/button_refresh.gif b/main/css/cool_blue/images/button_refresh.gif
new file mode 100644
index 0000000000..8268958a19
Binary files /dev/null and b/main/css/cool_blue/images/button_refresh.gif differ
diff --git a/main/css/cool_blue/images/button_upload.gif b/main/css/cool_blue/images/button_upload.gif
new file mode 100644
index 0000000000..3d91ac4404
Binary files /dev/null and b/main/css/cool_blue/images/button_upload.gif differ
diff --git a/main/css/corporate/default.css b/main/css/corporate/default.css
index 2b29f68fec..4702f4d52e 100644
--- a/main/css/corporate/default.css
+++ b/main/css/corporate/default.css
@@ -1836,17 +1836,17 @@ button:hover {
 	border-style: inset;
 }
 /* button with image */
-button.add, button.save, button.cancel, button.search, button.login, button.plus, button.minus, button.next, button.back {
+button.add, button.save, button.cancel, button.refresh, button.upload, button.search, button.login, button.plus, button.minus, button.next, button.back {
 	padding-left:30px;
 	background-position:10px;
 	background-repeat:no-repeat;
 }
 /* POSITIVE */
-button.save, button.add, button.search, button.login, button.plus, button.minus, button.next, button.back {
+button.save, button.add, button.search, button.refresh, button.upload, button.login, button.plus, button.minus, button.next, button.back {
 	background-color:#E5EDF9;
 	border-color: #D4E2F6;
 }
-button.save:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
+button.save:hover, button.refresh:hover, button.upload:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
 	border-color: #D4E2F6;
 	background-color:#D4E2F6;
 }
@@ -1878,6 +1878,7 @@ button.search {
 /*including "login" image*/
 button.login {
 	background-image:url(images/button_login.gif);
+	margin:2px 5px 3px 5px !important;
 }
 /*including "plus" image*/
 button.plus {
@@ -1895,6 +1896,15 @@ button.next {
 button.back {
 	background-image:url(images/button_back.gif);
 }
+/*including "refresh" image*/
+button.refresh {
+    background-image:url(images/button_refresh.gif);
+}
+/*including "upload" image*/
+button.upload {
+    background-image:url(images/button_upload.gif);
+}
+
 .icon_image_content {
 	width:70px;
 	cursor:hand;
diff --git a/main/css/corporate/images/button_refresh.gif b/main/css/corporate/images/button_refresh.gif
new file mode 100644
index 0000000000..8268958a19
Binary files /dev/null and b/main/css/corporate/images/button_refresh.gif differ
diff --git a/main/css/corporate/images/button_upload.gif b/main/css/corporate/images/button_upload.gif
new file mode 100644
index 0000000000..3d91ac4404
Binary files /dev/null and b/main/css/corporate/images/button_upload.gif differ
diff --git a/main/css/cosmic_campus/default.css b/main/css/cosmic_campus/default.css
index 64c395d53c..abd47f6eb1 100644
--- a/main/css/cosmic_campus/default.css
+++ b/main/css/cosmic_campus/default.css
@@ -1853,17 +1853,17 @@ button:hover {
 	border-style: inset;
 }
 /* button with image */
-button.add, button.save, button.cancel, button.search, button.login, button.plus, button.minus, button.next, button.back {
+button.add, button.save, button.cancel, button.refresh, button.upload, button.search, button.login, button.plus, button.minus, button.next, button.back {
 	padding-left:30px;
 	background-position:10px;
 	background-repeat:no-repeat;
 }
 /* POSITIVE */
-button.save, button.add, button.search, button.login, button.plus, button.minus, button.next, button.back {
+button.save, button.add, button.search, button.refresh, button.upload, button.login, button.plus, button.minus, button.next, button.back {
 	background-color:#E5EDF9;
 	border-color: #D4E2F6;
 }
-button.save:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
+button.save:hover, button.refresh:hover, button.upload:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
 	border-color: #D4E2F6;
 	background-color:#D4E2F6;
 }
@@ -1895,6 +1895,7 @@ button.search {
 /*including "login" image*/
 button.login {
 	background-image:url(images/button_login.gif);
+	margin:2px 5px 3px 5px !important;
 }
 /*including "plus" image*/
 button.plus {
@@ -1908,6 +1909,19 @@ button.minus {
 button.next {
 	background-image:url(images/button_next.gif);
 }
+/*including "back" image*/
+button.back {
+	background-image:url(images/button_back.gif);
+}
+/*including "refresh" image*/
+button.refresh {
+    background-image:url(images/button_refresh.gif);
+}
+/*including "upload" image*/
+button.upload {
+    background-image:url(images/button_upload.gif);
+}
+
 /*including "back" image*/
 button.back {
 	background-image:url(images/button_back.gif);
diff --git a/main/css/cosmic_campus/images/button_refresh.gif b/main/css/cosmic_campus/images/button_refresh.gif
new file mode 100644
index 0000000000..8268958a19
Binary files /dev/null and b/main/css/cosmic_campus/images/button_refresh.gif differ
diff --git a/main/css/cosmic_campus/images/button_upload.gif b/main/css/cosmic_campus/images/button_upload.gif
new file mode 100644
index 0000000000..3d91ac4404
Binary files /dev/null and b/main/css/cosmic_campus/images/button_upload.gif differ
diff --git a/main/css/delicious_bordeaux/default.css b/main/css/delicious_bordeaux/default.css
index e79dd648e5..be8616f0aa 100644
--- a/main/css/delicious_bordeaux/default.css
+++ b/main/css/delicious_bordeaux/default.css
@@ -2277,19 +2277,19 @@ button:hover {
 	border-style: inset;
 }
 /* button with image */
-button.add, button.save, button.cancel, button.search, button.login, button.plus, button.minus, button.next, button.back {
+button.add, button.save, button.cancel, button.refresh, button.upload, button.search, button.login, button.plus, button.minus, button.next, button.back {
 	padding-left:30px;
 	background-position:10px;
 	background-repeat:no-repeat;
 }
 /* POSITIVE */
-button.save, button.add, button.search, button.login, button.plus, button.minus, button.next, button.back {
-	background-color:#ddd;
+button.save, button.add, button.search, button.refresh, button.upload, button.login, button.plus, button.minus, button.next, button.back {
+	background-color:#E5EDF9;
 	border-color: #D4E2F6;
 }
-button.save:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
+button.save:hover, button.refresh:hover, button.upload:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
 	border-color: #D4E2F6;
-	background-color:#efefef;
+	background-color:#D4E2F6;
 }
 /* NEGATIVE */
 button.cancel {
@@ -2319,6 +2319,7 @@ button.search {
 /*including "login" image*/
 button.login {
 	background-image:url(images/button_login.gif);
+	margin:2px 5px 3px 5px !important;
 }
 /*including "plus" image*/
 button.plus {
@@ -2336,6 +2337,15 @@ button.next {
 button.back {
 	background-image:url(images/button_back.gif);
 }
+/*including "refresh" image*/
+button.refresh {
+    background-image:url(images/button_refresh.gif);
+}
+/*including "upload" image*/
+button.upload {
+    background-image:url(images/button_upload.gif);
+}
+
 .icon_image_content {
 	width:70px;
 	height:5em;
diff --git a/main/css/delicious_bordeaux/images/button_refresh.gif b/main/css/delicious_bordeaux/images/button_refresh.gif
new file mode 100644
index 0000000000..8268958a19
Binary files /dev/null and b/main/css/delicious_bordeaux/images/button_refresh.gif differ
diff --git a/main/css/delicious_bordeaux/images/button_upload.gif b/main/css/delicious_bordeaux/images/button_upload.gif
new file mode 100644
index 0000000000..3d91ac4404
Binary files /dev/null and b/main/css/delicious_bordeaux/images/button_upload.gif differ
diff --git a/main/css/dokeos_blue/default.css b/main/css/dokeos_blue/default.css
index d545e29809..835e158946 100644
--- a/main/css/dokeos_blue/default.css
+++ b/main/css/dokeos_blue/default.css
@@ -2276,19 +2276,19 @@ button:hover {
 	border-style: inset;
 }
 /* button with image */
-button.add, button.save, button.cancel, button.search, button.login, button.plus, button.minus, button.next, button.back {
+button.add, button.save, button.cancel, button.refresh, button.upload, button.search, button.login, button.plus, button.minus, button.next, button.back {
 	padding-left:30px;
 	background-position:10px;
 	background-repeat:no-repeat;
 }
 /* POSITIVE */
-button.save, button.add, button.search, button.login, button.plus, button.minus, button.next, button.back {
-	background-color:#ddd;
+button.save, button.add, button.search, button.refresh, button.upload, button.login, button.plus, button.minus, button.next, button.back {
+	background-color:#E5EDF9;
 	border-color: #D4E2F6;
 }
-button.save:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
+button.save:hover, button.refresh:hover, button.upload:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
 	border-color: #D4E2F6;
-	background-color:#efefef;
+	background-color:#D4E2F6;
 }
 /* NEGATIVE */
 button.cancel {
@@ -2318,6 +2318,7 @@ button.search {
 /*including "login" image*/
 button.login {
 	background-image:url(images/button_login.gif);
+	margin:2px 5px 3px 5px !important;
 }
 /*including "plus" image*/
 button.plus {
@@ -2335,6 +2336,16 @@ button.next {
 button.back {
 	background-image:url(images/button_back.gif);
 }
+/*including "refresh" image*/
+button.refresh {
+    background-image:url(images/button_refresh.gif);
+}
+/*including "upload" image*/
+button.upload {
+    background-image:url(images/button_upload.gif);
+}
+
+
 .icon_image_content {
 	width:70px;
 	height:5em;
diff --git a/main/css/dokeos_blue/images/button_refresh.gif b/main/css/dokeos_blue/images/button_refresh.gif
new file mode 100644
index 0000000000..8268958a19
Binary files /dev/null and b/main/css/dokeos_blue/images/button_refresh.gif differ
diff --git a/main/css/dokeos_blue/images/button_upload.gif b/main/css/dokeos_blue/images/button_upload.gif
new file mode 100644
index 0000000000..3d91ac4404
Binary files /dev/null and b/main/css/dokeos_blue/images/button_upload.gif differ
diff --git a/main/css/dokeos_classic/default.css b/main/css/dokeos_classic/default.css
index 59eb46dfed..986edd4489 100644
--- a/main/css/dokeos_classic/default.css
+++ b/main/css/dokeos_classic/default.css
@@ -2567,18 +2567,19 @@ button:hover {
 	color:#545454;
 	border-style: inset;
 }
+
 /* button with image */
-button.add, button.save, button.cancel, button.search, button.login, button.plus, button.minus, button.next, button.back {
+button.add, button.save, button.cancel, button.refresh, button.upload, button.search, button.login, button.plus, button.minus, button.next, button.back {
 	padding-left:30px;
 	background-position:10px;
 	background-repeat:no-repeat;
 }
 /* POSITIVE */
-button.save, button.add, button.search, button.login, button.plus, button.minus, button.next, button.back {
+button.save, button.add, button.search, button.refresh, button.upload, button.login, button.plus, button.minus, button.next, button.back {
 	background-color:#E5EDF9;
 	border-color: #D4E2F6;
 }
-button.save:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
+button.save:hover, button.refresh:hover, button.upload:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
 	border-color: #D4E2F6;
 	background-color:#D4E2F6;
 }
@@ -2610,6 +2611,7 @@ button.search {
 /*including "login" image*/
 button.login {
 	background-image:url(images/button_login.gif);
+	margin:2px 5px 3px 5px !important;
 }
 /*including "plus" image*/
 button.plus {
@@ -2627,6 +2629,16 @@ button.next {
 button.back {
 	background-image:url(images/button_back.gif);
 }
+/*including "refresh" image*/
+button.refresh {
+    background-image:url(images/button_refresh.gif);
+}
+/*including "upload" image*/
+button.upload {
+    background-image:url(images/button_upload.gif);
+}
+
+
 .icon_image_content {
 	width:70px;
 	cursor:hand;
diff --git a/main/css/dokeos_classic/images/button_refresh.gif b/main/css/dokeos_classic/images/button_refresh.gif
new file mode 100644
index 0000000000..8268958a19
Binary files /dev/null and b/main/css/dokeos_classic/images/button_refresh.gif differ
diff --git a/main/css/dokeos_classic/images/button_upload.gif b/main/css/dokeos_classic/images/button_upload.gif
new file mode 100644
index 0000000000..3d91ac4404
Binary files /dev/null and b/main/css/dokeos_classic/images/button_upload.gif differ
diff --git a/main/css/dokeos_classic_2D/default.css b/main/css/dokeos_classic_2D/default.css
index 92ca3aa053..fdf0144946 100644
--- a/main/css/dokeos_classic_2D/default.css
+++ b/main/css/dokeos_classic_2D/default.css
@@ -2611,17 +2611,17 @@ button:hover {
 	border-style: inset;
 }
 /* button with image */
-button.add, button.save, button.cancel, button.search, button.login, button.plus, button.minus, button.next, button.back {
+button.add, button.save, button.cancel, button.refresh, button.upload, button.search, button.login, button.plus, button.minus, button.next, button.back {
 	padding-left:30px;
 	background-position:10px;
 	background-repeat:no-repeat;
 }
 /* POSITIVE */
-button.save, button.add, button.search, button.login, button.plus, button.minus, button.next, button.back {
+button.save, button.add, button.search, button.refresh, button.upload, button.login, button.plus, button.minus, button.next, button.back {
 	background-color:#E5EDF9;
 	border-color: #D4E2F6;
 }
-button.save:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
+button.save:hover, button.refresh:hover, button.upload:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
 	border-color: #D4E2F6;
 	background-color:#D4E2F6;
 }
@@ -2653,6 +2653,7 @@ button.search {
 /*including "login" image*/
 button.login {
 	background-image:url(images/button_login.gif);
+	margin:2px 5px 3px 5px !important;
 }
 /*including "plus" image*/
 button.plus {
@@ -2670,6 +2671,15 @@ button.next {
 button.back {
 	background-image:url(images/button_back.gif);
 }
+/*including "refresh" image*/
+button.refresh {
+    background-image:url(images/button_refresh.gif);
+}
+/*including "upload" image*/
+button.upload {
+    background-image:url(images/button_upload.gif);
+}
+
 .icon_image_content {
 	width:70px;
 	cursor:hand;
diff --git a/main/css/dokeos_classic_2D/images/button_refresh.gif b/main/css/dokeos_classic_2D/images/button_refresh.gif
new file mode 100644
index 0000000000..8268958a19
Binary files /dev/null and b/main/css/dokeos_classic_2D/images/button_refresh.gif differ
diff --git a/main/css/dokeos_classic_2D/images/button_upload.gif b/main/css/dokeos_classic_2D/images/button_upload.gif
new file mode 100644
index 0000000000..3d91ac4404
Binary files /dev/null and b/main/css/dokeos_classic_2D/images/button_upload.gif differ
diff --git a/main/css/empire_green/default.css b/main/css/empire_green/default.css
index d2d837c125..f66c1f8272 100644
--- a/main/css/empire_green/default.css
+++ b/main/css/empire_green/default.css
@@ -2277,19 +2277,19 @@ button:hover {
 	border-style: inset;
 }
 /* button with image */
-button.add, button.save, button.cancel, button.search, button.login, button.plus, button.minus, button.next, button.back {
+button.add, button.save, button.cancel, button.refresh, button.upload, button.search, button.login, button.plus, button.minus, button.next, button.back {
 	padding-left:30px;
 	background-position:10px;
 	background-repeat:no-repeat;
 }
 /* POSITIVE */
-button.save, button.add, button.search, button.login, button.plus, button.minus, button.next, button.back {
-	background-color:#ddd;
+button.save, button.add, button.search, button.refresh, button.upload, button.login, button.plus, button.minus, button.next, button.back {
+	background-color:#E5EDF9;
 	border-color: #D4E2F6;
 }
-button.save:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
+button.save:hover, button.refresh:hover, button.upload:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
 	border-color: #D4E2F6;
-	background-color:#efefef;
+	background-color:#D4E2F6;
 }
 /* NEGATIVE */
 button.cancel {
@@ -2319,6 +2319,7 @@ button.search {
 /*including "login" image*/
 button.login {
 	background-image:url(images/button_login.gif);
+	margin:2px 5px 3px 5px !important;
 }
 /*including "plus" image*/
 button.plus {
@@ -2336,6 +2337,15 @@ button.next {
 button.back {
 	background-image:url(images/button_back.gif);
 }
+/*including "refresh" image*/
+button.refresh {
+    background-image:url(images/button_refresh.gif);
+}
+/*including "upload" image*/
+button.upload {
+    background-image:url(images/button_upload.gif);
+}
+
 .icon_image_content {
 	width:70px;
 	height:5em;
diff --git a/main/css/empire_green/images/button_refresh.gif b/main/css/empire_green/images/button_refresh.gif
new file mode 100644
index 0000000000..8268958a19
Binary files /dev/null and b/main/css/empire_green/images/button_refresh.gif differ
diff --git a/main/css/empire_green/images/button_upload.gif b/main/css/empire_green/images/button_upload.gif
new file mode 100644
index 0000000000..3d91ac4404
Binary files /dev/null and b/main/css/empire_green/images/button_upload.gif differ
diff --git a/main/css/fruity_orange/default.css b/main/css/fruity_orange/default.css
index 901a46671a..cd5e97b5ce 100644
--- a/main/css/fruity_orange/default.css
+++ b/main/css/fruity_orange/default.css
@@ -2277,19 +2277,19 @@ button:hover {
 	border-style: inset;
 }
 /* button with image */
-button.add, button.save, button.cancel, button.search, button.login, button.plus, button.minus, button.next, button.back {
+button.add, button.save, button.cancel, button.refresh, button.upload, button.search, button.login, button.plus, button.minus, button.next, button.back {
 	padding-left:30px;
 	background-position:10px;
 	background-repeat:no-repeat;
 }
 /* POSITIVE */
-button.save, button.add, button.search, button.login, button.plus, button.minus, button.next, button.back {
-	background-color:#ddd;
+button.save, button.add, button.search, button.refresh, button.upload, button.login, button.plus, button.minus, button.next, button.back {
+	background-color:#E5EDF9;
 	border-color: #D4E2F6;
 }
-button.save:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
+button.save:hover, button.refresh:hover, button.upload:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
 	border-color: #D4E2F6;
-	background-color:#efefef;
+	background-color:#D4E2F6;
 }
 /* NEGATIVE */
 button.cancel {
@@ -2319,6 +2319,7 @@ button.search {
 /*including "login" image*/
 button.login {
 	background-image:url(images/button_login.gif);
+	margin:2px 5px 3px 5px !important;
 }
 /*including "plus" image*/
 button.plus {
@@ -2336,6 +2337,15 @@ button.next {
 button.back {
 	background-image:url(images/button_back.gif);
 }
+/*including "refresh" image*/
+button.refresh {
+    background-image:url(images/button_refresh.gif);
+}
+/*including "upload" image*/
+button.upload {
+    background-image:url(images/button_upload.gif);
+}
+
 .icon_image_content {
 	width:70px;
 	height:5em;
diff --git a/main/css/fruity_orange/images/button_refresh.gif b/main/css/fruity_orange/images/button_refresh.gif
new file mode 100644
index 0000000000..8268958a19
Binary files /dev/null and b/main/css/fruity_orange/images/button_refresh.gif differ
diff --git a/main/css/fruity_orange/images/button_upload.gif b/main/css/fruity_orange/images/button_upload.gif
new file mode 100644
index 0000000000..3d91ac4404
Binary files /dev/null and b/main/css/fruity_orange/images/button_upload.gif differ
diff --git a/main/css/medical/default.css b/main/css/medical/default.css
index 865ac4be6f..4e4513b2bc 100644
--- a/main/css/medical/default.css
+++ b/main/css/medical/default.css
@@ -2527,17 +2527,17 @@ button:hover {
 	border-style: inset;
 }
 /* button with image */
-button.add, button.save, button.cancel, button.search, button.login, button.plus, button.minus, button.next, button.back {
+button.add, button.save, button.cancel, button.refresh, button.upload, button.search, button.login, button.plus, button.minus, button.next, button.back {
 	padding-left:30px;
 	background-position:10px;
 	background-repeat:no-repeat;
 }
 /* POSITIVE */
-button.save, button.add, button.search, button.login, button.plus, button.minus, button.next, button.back {
+button.save, button.add, button.search, button.refresh, button.upload, button.login, button.plus, button.minus, button.next, button.back {
 	background-color:#E5EDF9;
 	border-color: #D4E2F6;
 }
-button.save:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
+button.save:hover, button.refresh:hover, button.upload:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
 	border-color: #D4E2F6;
 	background-color:#D4E2F6;
 }
@@ -2569,6 +2569,7 @@ button.search {
 /*including "login" image*/
 button.login {
 	background-image:url(images/button_login.gif);
+	margin:2px 5px 3px 5px !important;
 }
 /*including "plus" image*/
 button.plus {
@@ -2586,6 +2587,15 @@ button.next {
 button.back {
 	background-image:url(images/button_back.gif);
 }
+/*including "refresh" image*/
+button.refresh {
+    background-image:url(images/button_refresh.gif);
+}
+/*including "upload" image*/
+button.upload {
+    background-image:url(images/button_upload.gif);
+}
+
 .icon_image_content {
 	width:70px;
 	cursor:hand;
diff --git a/main/css/medical/images/button_refresh.gif b/main/css/medical/images/button_refresh.gif
new file mode 100644
index 0000000000..8268958a19
Binary files /dev/null and b/main/css/medical/images/button_refresh.gif differ
diff --git a/main/css/medical/images/button_upload.gif b/main/css/medical/images/button_upload.gif
new file mode 100644
index 0000000000..3d91ac4404
Binary files /dev/null and b/main/css/medical/images/button_upload.gif differ
diff --git a/main/css/public_admin/default.css b/main/css/public_admin/default.css
index 582fde4438..2826b83912 100644
--- a/main/css/public_admin/default.css
+++ b/main/css/public_admin/default.css
@@ -2567,17 +2567,17 @@ button:hover {
 	border-style: inset;
 }
 /* button with image */
-button.add, button.save, button.cancel, button.search, button.login, button.plus, button.minus, button.next, button.back {
+button.add, button.save, button.cancel, button.refresh, button.upload, button.search, button.login, button.plus, button.minus, button.next, button.back {
 	padding-left:30px;
 	background-position:10px;
 	background-repeat:no-repeat;
 }
 /* POSITIVE */
-button.save, button.add, button.search, button.login, button.plus, button.minus, button.next, button.back {
+button.save, button.add, button.search, button.refresh, button.upload, button.login, button.plus, button.minus, button.next, button.back {
 	background-color:#E5EDF9;
 	border-color: #D4E2F6;
 }
-button.save:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
+button.save:hover, button.refresh:hover, button.upload:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
 	border-color: #D4E2F6;
 	background-color:#D4E2F6;
 }
@@ -2627,6 +2627,15 @@ button.next {
 button.back {
 	background-image:url(images/button_back.gif);
 }
+/*including "refresh" image*/
+button.refresh {
+    background-image:url(images/button_refresh.gif);
+}
+/*including "upload" image*/
+button.upload {
+    background-image:url(images/button_upload.gif);
+}
+
 .icon_image_content {
 	width:70px;
 	cursor:hand;
diff --git a/main/css/public_admin/images/button_refresh.gif b/main/css/public_admin/images/button_refresh.gif
new file mode 100644
index 0000000000..8268958a19
Binary files /dev/null and b/main/css/public_admin/images/button_refresh.gif differ
diff --git a/main/css/public_admin/images/button_upload.gif b/main/css/public_admin/images/button_upload.gif
new file mode 100644
index 0000000000..3d91ac4404
Binary files /dev/null and b/main/css/public_admin/images/button_upload.gif differ
diff --git a/main/css/royal_purple/default.css b/main/css/royal_purple/default.css
index 082f46277f..6eb663e58c 100644
--- a/main/css/royal_purple/default.css
+++ b/main/css/royal_purple/default.css
@@ -2277,19 +2277,19 @@ button:hover {
 	border-style: inset;
 }
 /* button with image */
-button.add, button.save, button.cancel, button.search, button.login, button.plus, button.minus, button.next, button.back {
+button.add, button.save, button.cancel, button.refresh, button.upload, button.search, button.login, button.plus, button.minus, button.next, button.back {
 	padding-left:30px;
 	background-position:10px;
 	background-repeat:no-repeat;
 }
 /* POSITIVE */
-button.save, button.add, button.search, button.login, button.plus, button.minus, button.next, button.back {
-	background-color:#ddd;
+button.save, button.add, button.search, button.refresh, button.upload, button.login, button.plus, button.minus, button.next, button.back {
+	background-color:#E5EDF9;
 	border-color: #D4E2F6;
 }
-button.save:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
+button.save:hover, button.refresh:hover, button.upload:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
 	border-color: #D4E2F6;
-	background-color:#efefef;
+	background-color:#D4E2F6;
 }
 /* NEGATIVE */
 button.cancel {
@@ -2319,6 +2319,7 @@ button.search {
 /*including "login" image*/
 button.login {
 	background-image:url(images/button_login.gif);
+	margin:2px 5px 3px 5px !important;
 }
 /*including "plus" image*/
 button.plus {
@@ -2336,6 +2337,15 @@ button.next {
 button.back {
 	background-image:url(images/button_back.gif);
 }
+/*including "refresh" image*/
+button.refresh {
+    background-image:url(images/button_refresh.gif);
+}
+/*including "upload" image*/
+button.upload {
+    background-image:url(images/button_upload.gif);
+}
+
 .icon_image_content {
 	width:70px;
 	height:9em;
diff --git a/main/css/royal_purple/images/button_refresh.gif b/main/css/royal_purple/images/button_refresh.gif
new file mode 100644
index 0000000000..8268958a19
Binary files /dev/null and b/main/css/royal_purple/images/button_refresh.gif differ
diff --git a/main/css/royal_purple/images/button_upload.gif b/main/css/royal_purple/images/button_upload.gif
new file mode 100644
index 0000000000..3d91ac4404
Binary files /dev/null and b/main/css/royal_purple/images/button_upload.gif differ
diff --git a/main/css/silver_line/default.css b/main/css/silver_line/default.css
index 2e44d82f5c..bf7731de10 100644
--- a/main/css/silver_line/default.css
+++ b/main/css/silver_line/default.css
@@ -2248,17 +2248,17 @@ button:hover {
 	border-style: inset;
 }
 /* button with image */
-button.add, button.save, button.cancel, button.search, button.login, button.plus, button.minus, button.next, button.back {
+button.add, button.save, button.cancel, button.refresh, button.upload, button.search, button.login, button.plus, button.minus, button.next, button.back {
 	padding-left:30px;
 	background-position:10px;
 	background-repeat:no-repeat;
 }
 /* POSITIVE */
-button.save, button.add, button.search, button.login, button.plus, button.minus, button.next, button.back {
+button.save, button.add, button.search, button.refresh, button.upload, button.login, button.plus, button.minus, button.next, button.back {
 	background-color:#E5EDF9;
 	border-color: #D4E2F6;
 }
-button.save:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
+button.save:hover, button.refresh:hover, button.upload:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
 	border-color: #D4E2F6;
 	background-color:#D4E2F6;
 }
@@ -2290,6 +2290,7 @@ button.search {
 /*including "login" image*/
 button.login {
 	background-image:url(images/button_login.gif);
+	margin:2px 5px 3px 5px !important;
 }
 /*including "plus" image*/
 button.plus {
@@ -2307,6 +2308,15 @@ button.next {
 button.back {
 	background-image:url(images/button_back.gif);
 }
+/*including "refresh" image*/
+button.refresh {
+    background-image:url(images/button_refresh.gif);
+}
+/*including "upload" image*/
+button.upload {
+    background-image:url(images/button_upload.gif);
+}
+
 .icon_image_content {
 	width:70px;
 	cursor:hand;
diff --git a/main/css/silver_line/images/button_refresh.gif b/main/css/silver_line/images/button_refresh.gif
new file mode 100644
index 0000000000..8268958a19
Binary files /dev/null and b/main/css/silver_line/images/button_refresh.gif differ
diff --git a/main/css/silver_line/images/button_upload.gif b/main/css/silver_line/images/button_upload.gif
new file mode 100644
index 0000000000..3d91ac4404
Binary files /dev/null and b/main/css/silver_line/images/button_upload.gif differ
diff --git a/main/css/sober_brown/default.css b/main/css/sober_brown/default.css
index 3a9ee18898..ab7c0fef30 100644
--- a/main/css/sober_brown/default.css
+++ b/main/css/sober_brown/default.css
@@ -2590,17 +2590,17 @@ button.cancel:hover {
 	background-color: #FFE3DE;
 }
 /* button with image */
-button.add, button.save, button.cancel, button.search, button.login, button.plus, button.minus, button.next, button.back {
+button.add, button.save, button.cancel, button.refresh, button.upload, button.search, button.login, button.plus, button.minus, button.next, button.back {
 	padding-left:30px;
 	background-position:10px;
 	background-repeat:no-repeat;
 }
 /* POSITIVE */
-button.save, button.add, button.search, button.login, button.plus, button.minus, button.next, button.back {
+button.save, button.add, button.search, button.refresh, button.upload, button.login, button.plus, button.minus, button.next, button.back {
 	background-color:#E5EDF9;
 	border-color: #D4E2F6;
 }
-button.save:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
+button.save:hover, button.refresh:hover, button.upload:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
 	border-color: #D4E2F6;
 	background-color:#D4E2F6;
 }
@@ -2632,6 +2632,7 @@ button.search {
 /*including "login" image*/
 button.login {
 	background-image:url(images/button_login.gif);
+	margin:2px 5px 3px 5px !important;
 }
 /*including "plus" image*/
 button.plus {
@@ -2649,6 +2650,15 @@ button.next {
 button.back {
 	background-image:url(images/button_back.gif);
 }
+/*including "refresh" image*/
+button.refresh {
+    background-image:url(images/button_refresh.gif);
+}
+/*including "upload" image*/
+button.upload {
+    background-image:url(images/button_upload.gif);
+}
+
 .icon_image_content {
 	width:70px;
 	cursor:hand;
diff --git a/main/css/sober_brown/images/button_refresh.gif b/main/css/sober_brown/images/button_refresh.gif
new file mode 100644
index 0000000000..8268958a19
Binary files /dev/null and b/main/css/sober_brown/images/button_refresh.gif differ
diff --git a/main/css/sober_brown/images/button_upload.gif b/main/css/sober_brown/images/button_upload.gif
new file mode 100644
index 0000000000..3d91ac4404
Binary files /dev/null and b/main/css/sober_brown/images/button_upload.gif differ
diff --git a/main/css/steel_grey/default.css b/main/css/steel_grey/default.css
index aa29082c2b..79cd6fb54f 100644
--- a/main/css/steel_grey/default.css
+++ b/main/css/steel_grey/default.css
@@ -2277,19 +2277,19 @@ button:hover {
 	border-style: inset;
 }
 /* button with image */
-button.add, button.save, button.cancel, button.search, button.login, button.plus, button.minus, button.next, button.back {
+button.add, button.save, button.cancel, button.refresh, button.upload, button.search, button.login, button.plus, button.minus, button.next, button.back {
 	padding-left:30px;
 	background-position:10px;
 	background-repeat:no-repeat;
 }
 /* POSITIVE */
-button.save, button.add, button.search, button.login, button.plus, button.minus, button.next, button.back {
-	background-color:#ddd;
+button.save, button.add, button.search, button.refresh, button.upload, button.login, button.plus, button.minus, button.next, button.back {
+	background-color:#E5EDF9;
 	border-color: #D4E2F6;
 }
-button.save:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
+button.save:hover, button.refresh:hover, button.upload:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
 	border-color: #D4E2F6;
-	background-color:#efefef;
+	background-color:#D4E2F6;
 }
 /* NEGATIVE */
 button.cancel {
@@ -2319,6 +2319,7 @@ button.search {
 /*including "login" image*/
 button.login {
 	background-image:url(images/button_login.gif);
+	margin:2px 5px 3px 5px !important;
 }
 /*including "plus" image*/
 button.plus {
@@ -2336,6 +2337,15 @@ button.next {
 button.back {
 	background-image:url(images/button_back.gif);
 }
+/*including "refresh" image*/
+button.refresh {
+    background-image:url(images/button_refresh.gif);
+}
+/*including "upload" image*/
+button.upload {
+    background-image:url(images/button_upload.gif);
+}
+
 .icon_image_content {
 	width:70px;
 	height:5em;
diff --git a/main/css/steel_grey/images/button_refresh.gif b/main/css/steel_grey/images/button_refresh.gif
new file mode 100644
index 0000000000..8268958a19
Binary files /dev/null and b/main/css/steel_grey/images/button_refresh.gif differ
diff --git a/main/css/steel_grey/images/button_upload.gif b/main/css/steel_grey/images/button_upload.gif
new file mode 100644
index 0000000000..3d91ac4404
Binary files /dev/null and b/main/css/steel_grey/images/button_upload.gif differ
diff --git a/main/css/tasty_olive/default.css b/main/css/tasty_olive/default.css
index 0a1c1b4707..714b824146 100644
--- a/main/css/tasty_olive/default.css
+++ b/main/css/tasty_olive/default.css
@@ -2276,19 +2276,19 @@ button:hover {
 	border-style: inset;
 }
 /* button with image */
-button.add, button.save, button.cancel, button.search, button.login, button.plus, button.minus, button.next, button.back {
+button.add, button.save, button.cancel, button.refresh, button.upload, button.search, button.login, button.plus, button.minus, button.next, button.back {
 	padding-left:30px;
 	background-position:10px;
 	background-repeat:no-repeat;
 }
 /* POSITIVE */
-button.save, button.add, button.search, button.login, button.plus, button.minus, button.next, button.back {
-	background-color:#ddd;
+button.save, button.add, button.search, button.refresh, button.upload, button.login, button.plus, button.minus, button.next, button.back {
+	background-color:#E5EDF9;
 	border-color: #D4E2F6;
 }
-button.save:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
+button.save:hover, button.refresh:hover, button.upload:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover {
 	border-color: #D4E2F6;
-	background-color:#efefef;
+	background-color:#D4E2F6;
 }
 /* NEGATIVE */
 button.cancel {
@@ -2318,6 +2318,7 @@ button.search {
 /*including "login" image*/
 button.login {
 	background-image:url(images/button_login.gif);
+	margin:2px 5px 3px 5px !important;
 }
 /*including "plus" image*/
 button.plus {
@@ -2335,6 +2336,15 @@ button.next {
 button.back {
 	background-image:url(images/button_back.gif);
 }
+/*including "refresh" image*/
+button.refresh {
+    background-image:url(images/button_refresh.gif);
+}
+/*including "upload" image*/
+button.upload {
+    background-image:url(images/button_upload.gif);
+}
+
 .icon_image_content {
 	width:70px;
 	height:5em;
diff --git a/main/css/tasty_olive/images/button_refresh.gif b/main/css/tasty_olive/images/button_refresh.gif
new file mode 100644
index 0000000000..8268958a19
Binary files /dev/null and b/main/css/tasty_olive/images/button_refresh.gif differ
diff --git a/main/css/tasty_olive/images/button_upload.gif b/main/css/tasty_olive/images/button_upload.gif
new file mode 100644
index 0000000000..3d91ac4404
Binary files /dev/null and b/main/css/tasty_olive/images/button_upload.gif differ
diff --git a/main/document/document.inc.php b/main/document/document.inc.php
index 198005922c..e6ca72226d 100644
--- a/main/document/document.inc.php
+++ b/main/document/document.inc.php
@@ -1,4 +1,4 @@
-<?php // $Id: document.inc.php 20672 2009-05-15 08:02:19Z pcool $
+<?php // $Id: document.inc.php 20798 2009-05-18 18:13:25Z cvargas1 $
 
 /*
 ==============================================================================
@@ -431,7 +431,7 @@ function build_move_to_selector($folders,$curdirpath,$move_file,$group_dir='')
 	$form .= '<div class="row">';
 	$form .= '	<div class="label"></div>';
 	$form .= '	<div class="formw">';	
-	$form .= '		<button type="submit" name="move_file_submit">'.get_lang('MoveFile').'</button>'."\n";
+	$form .= '		<button type="submit" class="next" name="move_file_submit">'.get_lang('MoveFile').'</button>'."\n";
 	$form .= '	</div>';	
 	$form .= '</div>';	
 
diff --git a/main/document/upload.php b/main/document/upload.php
index fa7c791d27..a0fd0a99bd 100644
--- a/main/document/upload.php
+++ b/main/document/upload.php
@@ -1,4 +1,4 @@
-<?php // $Id: upload.php 20420 2009-05-08 20:11:57Z herodoto $
+<?php // $Id: upload.php 20798 2009-05-18 18:13:25Z cvargas1 $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -562,7 +562,7 @@ $form->addElement('radio', 'if_exists', get_lang('UplWhatIfFileExists'), get_lan
 $form->addElement('radio', 'if_exists', '', get_lang('UplOverwriteLong'), 'overwrite');
 $form->addElement('radio', 'if_exists', '', get_lang('UplRenameLong'), 'rename');
 
-$form->addElement('style_submit_button', 'submitDocument', get_lang('SendDocument'),'class="save"');
+$form->addElement('style_submit_button', 'submitDocument', get_lang('SendDocument'),'class="upload"');
 
 $form->add_real_progress_bar('DocumentUpload','user_upload');
 
diff --git a/main/dropbox/dropbox_functions.inc.php b/main/dropbox/dropbox_functions.inc.php
index a74ec6d323..de67ab6775 100644
--- a/main/dropbox/dropbox_functions.inc.php
+++ b/main/dropbox/dropbox_functions.inc.php
@@ -86,6 +86,9 @@ function handle_multiple_actions()
 
 		foreach ($checked_file_ids as $key=>$value)
 		{
+			var_dump($value);
+			var_dump($to_cat_id);
+			var_dump($part);
 			store_move($value, $to_cat_id, $part);
 		}
 		return get_lang('FilesMoved');
@@ -187,7 +190,7 @@ function display_move_form($part, $id, $target=array())
 			<div class="label">
 			</div>
 			<div class="formw">
-				<button class="save" type="submit" name="do_move" value="'.get_lang('Ok').'">'.get_lang('MoveFile').'</button>
+				<button class="next" type="submit" name="do_move" value="'.get_lang('Ok').'">'.get_lang('MoveFile').'</button>
 			</div>
 		</div>	
 	';
@@ -645,7 +648,7 @@ function display_add_form()
 			<div class="label">
 			</div>
 			<div class="formw">
-				<button type="Submit" class="save" name="submitWork">'.dropbox_lang("upload", "noDLTT").'</button>
+				<button type="Submit" class="upload" name="submitWork">'.dropbox_lang("upload", "noDLTT").'</button>
 			</div>
 		</div>
 	';		
diff --git a/main/exercice/hotpotatoes.php b/main/exercice/hotpotatoes.php
index 272bd72ced..76ff9ad42b 100644
--- a/main/exercice/hotpotatoes.php
+++ b/main/exercice/hotpotatoes.php
@@ -22,7 +22,7 @@
 *	Code for Hotpotatoes integration.
 *	@package dokeos.exercise
 * 	@author Istvan Mandak
-* 	@version $Id: hotpotatoes.php 20234 2009-04-30 20:01:00Z cfasanando $
+* 	@version $Id: hotpotatoes.php 20798 2009-05-18 18:13:25Z cvargas1 $
 */
 
 
@@ -278,7 +278,7 @@ if((api_is_allowed_to_edit()) && (($finish == 0) || ($finish == 2)))
 	
 	echo '<div style="float:left;padding:10px" >
 			<input type="file" name="userFile"><br /><br />
-			<button type="submit" class="save" name="submit" value="'.get_lang('Send').'">'.get_lang('SendFile').'</button>
+			<button type="submit" class="upload" name="submit" value="'.get_lang('Send').'">'.get_lang('SendFile').'</button>
 		 </div>';
 	echo '<div>'.Display::display_icon('hotpotatoes.jpg','').'</div>';		
 	echo '</div></div>';
diff --git a/main/upload/form.scorm.php b/main/upload/form.scorm.php
index f226cd0cee..d50080a7c4 100644
--- a/main/upload/form.scorm.php
+++ b/main/upload/form.scorm.php
@@ -74,7 +74,7 @@ if(api_get_setting('search_enabled')=='true')
 		$form -> addElement ('text', $specific_field['code'], $specific_field['name'].' : ');
 	}
 }
-$form->addElement('style_submit_button','submit', get_lang('Send'),'class="save"');
+$form->addElement('style_submit_button','submit', get_lang('Send'),'class="upload"');
 
 $form->addElement('html', '<br /><br /><br />');
 /*$list = get_zip_files_in_garbage();
diff --git a/main/work/work.php b/main/work/work.php
index f1163c7f90..1f0b64b912 100644
--- a/main/work/work.php
+++ b/main/work/work.php
@@ -1,4 +1,4 @@
-<?php //$Id: work.php 20709 2009-05-15 19:12:37Z ivantcholakov $
+<?php //$Id: work.php 20798 2009-05-18 18:13:25Z cvargas1 $
 /* For licensing terms, see /dokeos_license.txt */
 /**
 *	@package dokeos.work
@@ -6,7 +6,7 @@
 * 	@author Patrick Cool <patrick.cool@UGent.be>, Ghent University - ability for course admins to specify wether uploaded documents are visible or invisible by default.
 * 	@author Roan Embrechts, code refactoring and virtual course support
 * 	@author Frederic Vauthier, directories management
-*  	@version $Id: work.php 20709 2009-05-15 19:12:37Z ivantcholakov $
+*  	@version $Id: work.php 20798 2009-05-18 18:13:25Z cvargas1 $
 *
 * 	@todo refactor more code into functions, use quickforms, coding standards, ...
 */
@@ -1188,11 +1188,11 @@ if ($is_course_member) {
 		// fix the Ok button when we see the tool in the learn path
 		if ($origin== 'learnpath') {
 			$form->addElement('html', '<div style="margin-left:137px">');		
-			$form->addElement('style_submit_button','submitWork', get_lang('SendFile'),array('class="save"','value="submitWork"'));		
+			$form->addElement('style_submit_button','submitWork', get_lang('SendFile'),array('class="upload"','value="submitWork"'));		
 			$form->addElement('html', '</div>');
 		} else {
 			//$form->addElement('submit','submitWork', get_lang('SendFile'));
-			$form->addElement('style_submit_button', 'submitWork', get_lang('SendFile'),array('class="save"','value="submitWork"'));
+			$form->addElement('style_submit_button', 'submitWork', get_lang('SendFile'),array('class="upload"','value="submitWork"'));
 		}
 		
 		if (!empty($_POST['submitWork']) || $edit) {