diff --git a/main/messages/send_message_to_userfriend.inc.php b/main/messages/send_message_to_userfriend.inc.php
old mode 100755
new mode 100644
index e37b029f0b..282c7b6e86
--- a/main/messages/send_message_to_userfriend.inc.php
+++ b/main/messages/send_message_to_userfriend.inc.php
@@ -34,16 +34,12 @@ if (api_get_setting('allow_message_tool')=='true') {
    		$user_info=api_get_user_info($userfriend_id); ?>
         <div id="display_response_id" style="height:200px;width:400px">
             <div class="row">
-                <div class="label">
-                    <?php echo api_xml_http_response_encode(get_lang('To')); ?>: 
-                </div>
-                <div class="formw">
-                    <div class="tag">
-                        <?php echo api_xml_http_response_encode(api_get_person_name($user_info['firstName'], $user_info['lastName'])); ?>			  		 
-                    </div>
-                </div>
-            </div>
-
+                <div class="label">                    
+                    <?php echo api_xml_http_response_encode(get_lang('To')); ?>:
+                    <?php echo api_xml_http_response_encode(api_get_person_name($user_info['firstName'], $user_info['lastName'])); ?>
+                </div>                
+            </div>    
+            <br />        
             <div class="row">
                 <div class="label">
                    <span style="color:red"> * </span><?php echo api_xml_http_response_encode(get_lang('Subject')); ?> :
@@ -52,6 +48,7 @@ if (api_get_setting('allow_message_tool')=='true') {
         	 		 <input id="txt_subject_id" type="text" style="width:400px;">
                 </div>                
             </div>
+            <br />  
             <div class="row">
                 <div class="label">
         	   		 <?php echo api_xml_http_response_encode(get_lang('Message')); ?> :
@@ -60,13 +57,14 @@ if (api_get_setting('allow_message_tool')=='true') {
         	   		 <textarea id="txt_area_invite" rows="5" cols="55"></textarea>		   		 			   		 
                 </div>                
             </div>
+            <br />  
            <div class="row">
                 <div class="label">        	   		
                 </div>
-                <div class="formw">
+            <div class="formw">
                 <button class="save" type="button" value="<?php echo api_xml_http_response_encode(get_lang('SendMessage')); ?>" onclick="action_database_panel('5','<?php echo $userfriend_id;?>')"><?php echo api_xml_http_response_encode(get_lang('SendMessage')) ?></button>			   		 
-                </div>                
-            </div>
+            </div>                
+          </div>
 </div>
 <?php
 	} else {
@@ -78,6 +76,8 @@ if (api_get_setting('allow_message_tool')=='true') {
 			<button class="save" type="button" value="<?php echo api_xml_http_response_encode(get_lang('SocialAddToFriends')); ?>" onclick="action_database_panel('4','<?php echo $userfriend_id;?>')" >
 			<?php echo api_xml_http_response_encode(get_lang('SendInvitation')) ?></button>
 		</div>
-<?php			}
-			} ?>
+<?php			
+        }
+    } 
+?>
 </div>
diff --git a/main/social/groups.php b/main/social/groups.php
old mode 100755
new mode 100644
index 5ba8989002..21d777238e
--- a/main/social/groups.php
+++ b/main/social/groups.php
@@ -264,9 +264,9 @@ if ($group_id != 0 ) {
 		if ($is_group_member || $group_info['visibility'] == GROUP_PERMISSION_OPEN) {
 		    if (!$is_group_member) {		        
     		    if (!in_array($my_group_role, array(GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER, GROUP_USER_PERMISSION_PENDING_INVITATION))) {
-                    echo '<a href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.Display::return_icon('group_join.png', get_lang('YouShouldJoinTheGroup'), array('hspace'=>'6')).get_lang('YouShouldJoinTheGroup').'</a>';
+                    echo '<a class="a_button white medium" href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a>';
                 } elseif ($my_group_role == GROUP_USER_PERMISSION_PENDING_INVITATION) {
-                    echo '<a href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.Display::return_icon('group_join.png', get_lang('YouHaveBeenInvitedJoinNow'), array('hspace'=>'6')).get_lang('YouHaveBeenInvitedJoinNow').'</a>';
+                    echo '<a class="a_button white medium" href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('YouHaveBeenInvitedJoinNow').'</a>';
                 }
                 echo '<br /><br />';
 		    }            
@@ -322,9 +322,9 @@ if ($group_id != 0 ) {
 		} else {
 			// if I already sent an invitation message
 			if (!in_array($my_group_role, array(GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER, GROUP_USER_PERMISSION_PENDING_INVITATION))) {
-				echo '<a href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.Display::return_icon('group_join.png', get_lang('YouShouldJoinTheGroup'), array('hspace'=>'6')).get_lang('YouShouldJoinTheGroup').'</a>';
+				echo '<a class="a_button white medium" href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a>';
 			} elseif ($my_group_role == GROUP_USER_PERMISSION_PENDING_INVITATION) {
-				echo '<a href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.Display::return_icon('group_join.png', get_lang('YouHaveBeenInvitedJoinNow'), array('hspace'=>'6')).get_lang('YouHaveBeenInvitedJoinNow').'</a>';
+				echo '<a class="a_button white medium" href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('YouHaveBeenInvitedJoinNow').'</a>';
 			}
 		}
 	echo '</div>'; // end layout messages
@@ -412,7 +412,7 @@ if ($group_id != 0 ) {
             //Avoiding my groups
             $join_url = '';
 		    if (!in_array($id,$my_group_list)) {
-			    $join_url = '<a href="groups.php?id='.$id.'&action=join&u='.api_get_user_id().'">'.Display::return_icon('group_join.png', get_lang('JoinGroup'), array('hspace'=>'6')).''.get_lang('JoinGroup').'</a> ';
+			    $join_url = '<a class="a_button white medium" href="groups.php?id='.$id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a> ';
 		    }
 			
 			$item_4 = '<div class="box_description_group_actions" >'.$join_url.'</div>';
@@ -457,7 +457,7 @@ if ($group_id != 0 ) {
 
 			    $join_url = '';
     		    if (!in_array($id,$my_group_list)) {
-    			    $join_url = '<a href="groups.php?id='.$id.'&action=join&u='.api_get_user_id().'">'.Display::return_icon('group_join.png', get_lang('JoinGroup'), array('hspace'=>'6')).''.get_lang('JoinGroup').'</a> ';
+    			    $join_url = '<a class="a_button white medium" href="groups.php?id='.$id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a> ';
     		    }
 			    $item_4 = '<div class="box_description_group_actions" >'.$join_url.'</div>';