diff --git a/fbconnect.admin.inc b/fbconnect.admin.inc
index f54e1fc..93b321c 100644
--- a/fbconnect.admin.inc
+++ b/fbconnect.admin.inc
@@ -149,16 +149,16 @@ function fbconnect_appearance_settings(&$form_state) {
   );
   
   $options_pic_size = array(
-    'thumb' => t('Thumb (50px wide)'),
-    'small' => t('Small (100px wide)'),
-    'normal' => t('Normal (200px wide)'),
-    'square' => t('Square (50px by 50px)'),
+    'square' => t('Square (50px by 50px thumbnail)'),
+    'small' => t('Small (50px wide, variable height)'),
+    'normal' => t('Normal (100px wide, variable height)'),
+    'large' => t('Large (180px wide, variable height)'),
   );
   
   $form['display']['fbconnect_pic_size'] = array(
     '#type' => 'select',
     '#title' => t('Default Facebook picture size'),
-    '#description' => t('This will set the default user picture size throughout the site. If your user decides to use his facebook picture, choose its size here.'),
+    '#description' => t('This will set the default user picture size throughout the site. If your user decides to use their facebook picture, choose its size here.'),
     '#default_value' => variable_get('fbconnect_pic_size', 'square'),
     '#options' => $options_pic_size,
   );
@@ -166,32 +166,25 @@ function fbconnect_appearance_settings(&$form_state) {
   $form['display']['fbconnect_pic_size_nodes'] = array(
     '#type' => 'select',
     '#title' => t('Node Facebook picture size'),
-    '#description' => t('This will set the picture size when viewing a node post. If your user decides to use his facebook picture, choose its size here.'),
+    '#description' => t('This will set the picture size when viewing a node post. If your user decides to use thier facebook picture, choose its size here.'),
     '#default_value' => variable_get('fbconnect_pic_size_nodes', 'square'),
     '#options' => $options_pic_size,
   );
   $form['display']['fbconnect_pic_size_comments'] = array(
     '#type' => 'select',
     '#title' => t('Comments Facebook picture size'),
-    '#description' => t('This will set the picture size when viewing a comment post. If your user decides to use his facebook picture, choose its size here.'),
+    '#description' => t('This will set the picture size when viewing a comment post. If your user decides to use their facebook picture, choose its size here.'),
     '#default_value' => variable_get('fbconnect_pic_size_comments', 'square'),
     '#options' => $options_pic_size,
   );
   $form['display']['fbconnect_pic_size_profile'] = array(
     '#type' => 'select',
     '#title' => t('Profile Facebook picture size'),
-    '#description' => t('This will set the picture size when viewing a user\'s profile page. If your user decides to use his facebook picture, choose its size here.'),
+    '#description' => t('This will set the picture size when viewing a user\'s profile page. If your user decides to use their facebook picture, choose its size here.'),
     '#default_value' => variable_get('fbconnect_pic_size_profile', 'small'),
     '#options' => $options_pic_size,
   );  
 
-  $form['display']['fbconnect_pic_logo'] = array(
-    '#type' => 'checkbox',
-    '#title' => t('Show Facebook Logo'),
-    '#description' => t('Uncheck this if you don\'t want to display the facebook logo on the user picture.'),
-    '#default_value' => variable_get('fbconnect_pic_logo', TRUE),
-  );
-
   $form['excludes'] = array(
     '#type' => 'fieldset',
     '#collapsible' => TRUE,
@@ -407,4 +400,5 @@ function _fbconnect_language_codes() {
     'zh_TW' => 'Traditional Chinese (Taiwan)',
     'zu_ZA' => 'Zulu',
   );
-}
\ No newline at end of file
+}
+
diff --git a/fbconnect.module b/fbconnect.module
index 9e9b91c..4f4ebd4 100644
--- a/fbconnect.module
+++ b/fbconnect.module
@@ -88,7 +88,7 @@ function fbconnect_menu() {
 function fbconnect_theme() {
   return array(
     'fbconnect_user_picture_override' => array(
-      'arguments' => array('fbuid' => NULL, 'account' => NULL, 'user_url' => NULL, 'size' => '', 'logo' => TRUE),
+      'arguments' => array('fbuid' => NULL, 'account' => NULL, 'size' => ''),
       'file'      => 'fbconnect.pages.inc',
     ),
     'fbconnect_login_button' => array(
@@ -776,10 +776,10 @@ function fbconnect_theme_user_picture_override($account) {
   if (isset($account->fbconnect_picture_preset)) {
     $preset = $account->fbconnect_picture_preset;
   }
-  elseif (variable_get('fbconnect_pic_size', '')) {
+  else {
     // Default user picture preset.
     $preset = variable_get('fbconnect_pic_size', 'square');
-  } 
+  }
   
   if (!isset($account->fbuid)) {
     $user_data = unserialize(db_result(db_query('SELECT data FROM {users} WHERE uid = %d', $account->uid)));
@@ -787,11 +787,10 @@ function fbconnect_theme_user_picture_override($account) {
     $account->fb_avatar = @$user_data['fb_avatar'];
   }
   // First learn the Facebook id
-  $fbuid    = $account->fbuid;
-  $user_url = url('user/' . $account->uid);
+  $fbuid = $account->fbuid;
 
   if ($fbuid && isset($account->fb_avatar) && $account->fb_avatar) {
-    $output = theme('fbconnect_user_picture_override', $fbuid, $account, $user_url, variable_get('fbconnect_pic_size', $preset), variable_get('fbconnect_pic_logo', TRUE));
+    $output = theme('fbconnect_user_picture_override', $fbuid, $account, $preset);
   } 
   else {  
     $output = theme('fbconnect_user_picture_orig', $account); // Markup without fb_connect.
@@ -875,4 +874,5 @@ function fbconnect_menu_alter(&$callbacks) {
 
 function _fbconnect_is_excluded_page($path) {
   return drupal_match_path($path, variable_get('fbconnect_exclude_patterns', ''));
-}
\ No newline at end of file
+}
+
diff --git a/fbconnect.pages.inc b/fbconnect.pages.inc
index 0d005e6..3dd92de 100644
--- a/fbconnect.pages.inc
+++ b/fbconnect.pages.inc
@@ -280,13 +280,22 @@ function fbconnect_user_settings_form_submit($form, &$form_state) {
 /**
  * Make rendering of facebook user picture themeable
  */
-function theme_fbconnect_user_picture_override($fbuid = '', $account = NULL, $user_url = '', $size = 'square', $logo = TRUE) {
+function theme_fbconnect_user_picture_override($fbuid = '', $account = NULL, $size = 'square') {
   $protocol = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http';
+  $image = theme('image', $protocol . "://graph.facebook.com/" . $fbuid . "/picture?type=" . $size, $account->name, $account->name . '\'s picture', NULL, FALSE);
+
+  if (user_access('access user profiles')) {
+    $themed_image = l($image, 'user/' . $account->uid, array('html' => TRUE, 'attributes' =>
+      array('title' => t('View user profile'))));
+  }
+  else {
+    $themed_image = $image; 
+  }
   $output = <<<PIC
     <div class="picture">
-      <a href="$user_url">
-        <img src="$protocol://graph.facebook.com/$fbuid/picture?type=$size" />
-      </a>
+      <span class="fbconnet-image">
+        $themed_image
+      </span>
     </div>
 PIC;
   return $output;
@@ -321,4 +330,5 @@ function fbconnect_link_callback() {
   global $user;
   drupal_get_messages('status');
   drupal_goto("user/{$user->uid}/edit/fbconnect");
-}
\ No newline at end of file
+}
+