diff --git a/main/css/academica/default.css b/main/css/academica/default.css
index 0b891edae3..86d7ebf72b 100644
--- a/main/css/academica/default.css
+++ b/main/css/academica/default.css
@@ -773,7 +773,15 @@ footer a:link, footer a:visited {
 #bottomhellomindfactory {    
     background:transparent url('images/textologo.jpg') no-repeat;
 }
-
+.user_login_icon{
+  background: url(images/user_icon.png) no-repeat 5px center;
+}
+.user_password_icon{
+  background: url(images/user_password.png) no-repeat 5px center;
+}
+.form-vertical .controls input.span2{
+  padding-left: 25px;
+}
 /*including "login" image*/
 button.login {
     background-image:url(images/bg-button.gif);
diff --git a/main/css/academica/images/user_icon.png b/main/css/academica/images/user_icon.png
new file mode 100644
index 0000000000..cdb2d3ac4e
Binary files /dev/null and b/main/css/academica/images/user_icon.png differ
diff --git a/main/css/academica/images/user_password.png b/main/css/academica/images/user_password.png
new file mode 100644
index 0000000000..77cab16886
Binary files /dev/null and b/main/css/academica/images/user_password.png differ
diff --git a/main/css/baby_orange/default.css b/main/css/baby_orange/default.css
index 7e3cd3db14..ccc897c2a3 100644
--- a/main/css/baby_orange/default.css
+++ b/main/css/baby_orange/default.css
@@ -699,25 +699,26 @@ footer a:link, footer a:visited {
 .new_actions-fixed{
   top: 49px;
 }
-
+.user_login_icon{
+  background: url(images/user_icon.png) no-repeat 5px center;
+}
+.user_password_icon{
+  background: url(images/user_password.png) no-repeat 5px center;
+}
+.form-vertical .controls input.span2{
+  padding-left: 25px;
+}
+/*including "login" image*/
+button.login {
+    background-image:url(images/bg-button.gif);
+}
 /*including "save" image*/
 button.save {
-    background:url(images/accept.png) 0 center no-repeat #F0F0F0;
-    color: #666;
-    text-shadow:none;
-}
-button.save:hover {
-    background:url(images/accept.png) 0 center no-repeat #ffffff;
-    color: #666;
-    text-shadow:none;
+    background-image:url(images/button_accept.png)
 }
 /*including "add" image*/
 .controls .btn.add {
-    background:url(images/add.png) 0 center no-repeat #EC5923;
-    padding-left: 36px;
-}
-.controls .btn.add:hover {
-    background:url(images/add.png) 0 center no-repeat #EA4E15;
+    background-image:url(images/button_plus_green.png);
     padding-left: 36px;
 }
 /*including "cancel" image*/
@@ -726,22 +727,15 @@ button.cancel {
 }
 /*including "search" image*/
 button.search {
-    background:url(images/buttom.png) 0 center no-repeat #F0F0F0;
-    color: #666;
-    text-shadow:none;
-}
-button.search:hover {
-    background:url(images/buttom.png) 0 center no-repeat #ffffff;
-    color: #666;
-    text-shadow:none;
+    background-image:url(images/bg-button.png);
 }
 /*including "plus" image*/
 button.plus {
-    background-image:url(images/button_plus.gif);
+    background-image:url(images/button_plus_blue.png);
 }
 /*including "minus" image*/
 button.minus {
-    background-image:url(images/button_minus.gif);
+    background-image:url(images/button_minus.png);
 }
 /*including "next" image*/
 button.next {
diff --git a/main/css/baby_orange/images/accept.png b/main/css/baby_orange/images/accept.png
deleted file mode 100644
index 252ce9d25e..0000000000
Binary files a/main/css/baby_orange/images/accept.png and /dev/null differ
diff --git a/main/css/baby_orange/images/add.png b/main/css/baby_orange/images/add.png
deleted file mode 100644
index 3d578ca80b..0000000000
Binary files a/main/css/baby_orange/images/add.png and /dev/null differ
diff --git a/main/css/baby_orange/images/bg-button.gif b/main/css/baby_orange/images/bg-button.gif
deleted file mode 100644
index 57f7fe3bee..0000000000
Binary files a/main/css/baby_orange/images/bg-button.gif and /dev/null differ
diff --git a/main/css/baby_orange/images/bg-button.png b/main/css/baby_orange/images/bg-button.png
new file mode 100644
index 0000000000..bdd66f531d
Binary files /dev/null and b/main/css/baby_orange/images/bg-button.png differ
diff --git a/main/css/baby_orange/images/button_accept.gif b/main/css/baby_orange/images/button_accept.gif
deleted file mode 100755
index b3618202a4..0000000000
Binary files a/main/css/baby_orange/images/button_accept.gif and /dev/null differ
diff --git a/main/css/baby_orange/images/button_accept.png b/main/css/baby_orange/images/button_accept.png
new file mode 100644
index 0000000000..6fb82d28fe
Binary files /dev/null and b/main/css/baby_orange/images/button_accept.png differ
diff --git a/main/css/baby_orange/images/button_add.gif b/main/css/baby_orange/images/button_add.gif
deleted file mode 100755
index 7e4c53733a..0000000000
Binary files a/main/css/baby_orange/images/button_add.gif and /dev/null differ
diff --git a/main/css/baby_orange/images/button_back.gif b/main/css/baby_orange/images/button_back.gif
deleted file mode 100755
index 7ff8ccb25d..0000000000
Binary files a/main/css/baby_orange/images/button_back.gif and /dev/null differ
diff --git a/main/css/baby_orange/images/button_minus.gif b/main/css/baby_orange/images/button_minus.gif
deleted file mode 100755
index 350b7ecc1a..0000000000
Binary files a/main/css/baby_orange/images/button_minus.gif and /dev/null differ
diff --git a/main/css/baby_orange/images/button_minus.png b/main/css/baby_orange/images/button_minus.png
new file mode 100644
index 0000000000..bb6d0befc8
Binary files /dev/null and b/main/css/baby_orange/images/button_minus.png differ
diff --git a/main/css/baby_orange/images/button_next.gif b/main/css/baby_orange/images/button_next.gif
deleted file mode 100755
index e816758985..0000000000
Binary files a/main/css/baby_orange/images/button_next.gif and /dev/null differ
diff --git a/main/css/baby_orange/images/button_plus_blue.png b/main/css/baby_orange/images/button_plus_blue.png
new file mode 100644
index 0000000000..78dd59543d
Binary files /dev/null and b/main/css/baby_orange/images/button_plus_blue.png differ
diff --git a/main/css/baby_orange/images/button_plus_green.png b/main/css/baby_orange/images/button_plus_green.png
new file mode 100644
index 0000000000..fbf0aadfd0
Binary files /dev/null and b/main/css/baby_orange/images/button_plus_green.png differ
diff --git a/main/css/baby_orange/images/user_icon.png b/main/css/baby_orange/images/user_icon.png
new file mode 100644
index 0000000000..cdb2d3ac4e
Binary files /dev/null and b/main/css/baby_orange/images/user_icon.png differ
diff --git a/main/css/baby_orange/images/user_password.png b/main/css/baby_orange/images/user_password.png
new file mode 100644
index 0000000000..77cab16886
Binary files /dev/null and b/main/css/baby_orange/images/user_password.png differ
diff --git a/main/css/chamilo/default.css b/main/css/chamilo/default.css
index f2861303a0..c4e8838ec3 100644
--- a/main/css/chamilo/default.css
+++ b/main/css/chamilo/default.css
@@ -375,14 +375,11 @@ a.thumbnail:hover{
     font-weight: normal;
     font-size: 20px;
     padding-left: 10px;
-    width: 250px;
 }
 #course_tools .course-title-tools h3 {
     margin-top: 10px;
     color: #0191C7;
     font-weight: normal;
-
-
 }
 .page-header {
   border-bottom-color: #0191C7;
@@ -834,7 +831,15 @@ footer a:link, footer a:visited {
 #bottomhellomindfactory {
     background:transparent url('images/textologo.jpg') no-repeat;
 }
-
+.user_login_icon{
+  background: url(images/user_icon.png) no-repeat 5px center;
+}
+.user_password_icon{
+  background: url(images/user_password.png) no-repeat 5px center;
+}
+.form-vertical .controls input.span2{
+  padding-left: 25px;
+}
 /*including "login" image*/
 button.login {
     background-image:url(images/bg-button.gif);
@@ -845,22 +850,11 @@ button.login:hover {
 
 /*including "save" image*/
 button.save {
-    background:url(images/accept.png) 0 center no-repeat #F0F0F0;
-    color: #666;
-    padding-left: 30px;
-}
-button.save:hover {
-    background:url(images/accept.png) 0 center no-repeat #ffffff;
-    color: #666;
-    padding-left: 30px;
+    background-image:url(images/button_accept.png)
 }
 /*including "add" image*/
 .controls .btn.add {
-    background:url(images/add.png) 0 center no-repeat;
-    padding-left: 36px;
-}
-.controls .btn.add:hover {
-    background:url(images/add.png) 0 center no-repeat;
+    background-image:url(images/button_plus_green.png);
     padding-left: 36px;
 }
 /*including "cancel" image*/
@@ -869,22 +863,15 @@ button.cancel {
 }
 /*including "search" image*/
 button.search {
-    background:url(images/buttom.png) 0 center no-repeat #F0F0F0;
-    color: #666;
-    padding-left: 30px;
-}
-button.search:hover {
-    background:url(images/buttom.png) 0 center no-repeat #ffffff;
-    color: #666;
-    padding-left: 30px;
+    background-image:url(images/bg-button.png);
 }
 /*including "plus" image*/
 button.plus {
-    background-image:url(images/button_plus.gif);
+    background-image:url(images/button_plus_blue.png);
 }
 /*including "minus" image*/
 button.minus {
-    background-image:url(images/button_minus.gif);
+    background-image:url(images/button_minus.png);
 }
 /*including "next" image*/
 button.next {
diff --git a/main/css/chamilo/images/accept.png b/main/css/chamilo/images/accept.png
deleted file mode 100644
index 252ce9d25e..0000000000
Binary files a/main/css/chamilo/images/accept.png and /dev/null differ
diff --git a/main/css/chamilo/images/accept_data.png b/main/css/chamilo/images/accept_data.png
deleted file mode 100644
index 252ce9d25e..0000000000
Binary files a/main/css/chamilo/images/accept_data.png and /dev/null differ
diff --git a/main/css/chamilo/images/add.png b/main/css/chamilo/images/add.png
deleted file mode 100644
index 2c787d0245..0000000000
Binary files a/main/css/chamilo/images/add.png and /dev/null differ
diff --git a/main/css/chamilo/images/bg-button.gif b/main/css/chamilo/images/bg-button.gif
deleted file mode 100755
index 57f7fe3bee..0000000000
Binary files a/main/css/chamilo/images/bg-button.gif and /dev/null differ
diff --git a/main/css/chamilo/images/bg-button.png b/main/css/chamilo/images/bg-button.png
new file mode 100644
index 0000000000..bdd66f531d
Binary files /dev/null and b/main/css/chamilo/images/bg-button.png differ
diff --git a/main/css/chamilo/images/buttom.png b/main/css/chamilo/images/buttom.png
deleted file mode 100644
index a90b66ce4c..0000000000
Binary files a/main/css/chamilo/images/buttom.png and /dev/null differ
diff --git a/main/css/chamilo/images/button_accept.gif b/main/css/chamilo/images/button_accept.gif
deleted file mode 100644
index b3618202a4..0000000000
Binary files a/main/css/chamilo/images/button_accept.gif and /dev/null differ
diff --git a/main/css/chamilo/images/button_accept.png b/main/css/chamilo/images/button_accept.png
new file mode 100644
index 0000000000..6fb82d28fe
Binary files /dev/null and b/main/css/chamilo/images/button_accept.png differ
diff --git a/main/css/chamilo/images/button_add.gif b/main/css/chamilo/images/button_add.gif
deleted file mode 100644
index 7e4c53733a..0000000000
Binary files a/main/css/chamilo/images/button_add.gif and /dev/null differ
diff --git a/main/css/chamilo/images/button_back.gif b/main/css/chamilo/images/button_back.gif
deleted file mode 100644
index 7ff8ccb25d..0000000000
Binary files a/main/css/chamilo/images/button_back.gif and /dev/null differ
diff --git a/main/css/chamilo/images/button_minus.png b/main/css/chamilo/images/button_minus.png
new file mode 100644
index 0000000000..bb6d0befc8
Binary files /dev/null and b/main/css/chamilo/images/button_minus.png differ
diff --git a/main/css/chamilo/images/button_next.gif b/main/css/chamilo/images/button_next.gif
deleted file mode 100644
index e816758985..0000000000
Binary files a/main/css/chamilo/images/button_next.gif and /dev/null differ
diff --git a/main/css/chamilo/images/button_plus_blue.png b/main/css/chamilo/images/button_plus_blue.png
new file mode 100644
index 0000000000..78dd59543d
Binary files /dev/null and b/main/css/chamilo/images/button_plus_blue.png differ
diff --git a/main/css/chamilo/images/button_plus_green.png b/main/css/chamilo/images/button_plus_green.png
new file mode 100644
index 0000000000..fbf0aadfd0
Binary files /dev/null and b/main/css/chamilo/images/button_plus_green.png differ
diff --git a/main/css/chamilo/images/user_icon.png b/main/css/chamilo/images/user_icon.png
new file mode 100644
index 0000000000..cdb2d3ac4e
Binary files /dev/null and b/main/css/chamilo/images/user_icon.png differ
diff --git a/main/css/chamilo/images/user_password.png b/main/css/chamilo/images/user_password.png
new file mode 100644
index 0000000000..77cab16886
Binary files /dev/null and b/main/css/chamilo/images/user_password.png differ
diff --git a/main/inc/lib/userportal.lib.php b/main/inc/lib/userportal.lib.php
index aba862aae2..6eff2b23d6 100644
--- a/main/inc/lib/userportal.lib.php
+++ b/main/inc/lib/userportal.lib.php
@@ -678,8 +678,8 @@ class IndexManager
     function display_login_form()
     {
         $form = new FormValidator('formLogin', 'POST', null,  null, array('class'=>'form-vertical'));
-        $form->addElement('text', 'login', get_lang('UserName'), array('id' => 'login', 'class' => 'span2 autocapitalize_off', 'autofocus' => 'autofocus'));
-        $form->addElement('password', 'password', get_lang('Pass'), array('id' => 'password', 'class' => 'span2'));
+        $form->addElement('text', 'login', get_lang('UserName'), array('id' => 'login', 'class' => 'span2 user_login_icon autocapitalize_off', 'autofocus' => 'autofocus'));
+        $form->addElement('password', 'password', get_lang('Pass'), array('id' => 'password', 'class' => 'span2 user_password_icon'));
         global $_configuration;
 
         // Captcha