diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index 1db35237ed..19f53b8828 100644
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -119,9 +119,8 @@ class AvatarsettingsAction extends AccountSettingsAction
 
         $this->elementStart('ul', 'form_data');
         if ($original) {
-            $this->elementStart('li',
-                                array('id' => 'avatar_original',
-                                      'class' => 'avatar_view'));
+            $this->elementStart('li', array('id' => 'avatar_original',
+                                            'class' => 'avatar_view'));
             $this->element('h2', null, _("Original"));
             $this->elementStart('div', array('id'=>'avatar_original_view'));
             $this->element('img', array('src' => $original->url,
@@ -135,16 +134,16 @@ class AvatarsettingsAction extends AccountSettingsAction
         $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
 
         if ($avatar) {
-            $this->elementStart('li',
-                                array('id' => 'avatar_preview',
-                                      'class' => 'avatar_view'));
+            $this->elementStart('li', array('id' => 'avatar_preview',
+                                            'class' => 'avatar_view'));
             $this->element('h2', null, _("Preview"));
             $this->elementStart('div', array('id'=>'avatar_preview_view'));
-            $this->element('img', array('src' => $original->url,//$avatar->url,
+            $this->element('img', array('src' => $original->url,
                                         'width' => AVATAR_PROFILE_SIZE,
                                         'height' => AVATAR_PROFILE_SIZE,
                                         'alt' => $user->nickname));
             $this->elementEnd('div');
+            $this->elementEnd('li');
         }
 
         $this->elementStart('li', array ('id' => 'settings_attach'));
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index b4f3ffd54a..4eee3449be 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -226,7 +226,7 @@ position:absolute;
 right:0;
 top:49px;
 float:right;
-width:322px;
+width:300px;
 }
 #page_notice {
 clear:both;