diff --git a/lib/framework.php b/lib/framework.php
index 00fa6ab6d9..bf383e085f 100644
--- a/lib/framework.php
+++ b/lib/framework.php
@@ -29,9 +29,9 @@ define('GNUSOCIAL_VERSION', GNUSOCIAL_BASE_VERSION . '-' . GNUSOCIAL_LIFECYCLE);
 
 define('GNUSOCIAL_CODENAME', 'Not decided yet');
 
-define('AVATAR_PROFILE_SIZE', 96);
-define('AVATAR_STREAM_SIZE', 48);
-define('AVATAR_MINI_SIZE', 24);
+define('AVATAR_PROFILE_SIZE', 128);
+define('AVATAR_STREAM_SIZE', 64);
+define('AVATAR_MINI_SIZE', 32);
 
 define('NOTICES_PER_PAGE', 20);
 define('PROFILES_PER_PAGE', 20);
diff --git a/lib/groupminilist.php b/lib/groupminilist.php
index 8e3d2a70ce..d522842b74 100644
--- a/lib/groupminilist.php
+++ b/lib/groupminilist.php
@@ -33,7 +33,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 require_once INSTALLDIR.'/lib/grouplist.php';
 
-define('GROUPS_PER_MINILIST', 8);
+define('GROUPS_PER_MINILIST', MINILIST_PER_PAGE);
 
 /**
  * Widget to show a list of groups, good for sidebar
diff --git a/lib/profilelist.php b/lib/profilelist.php
index 11ed8945e9..7186a77f76 100644
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -34,6 +34,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 require_once INSTALLDIR.'/lib/widget.php';
 require_once INSTALLDIR.'/lib/peopletags.php';
 
+define('MINILIST_PER_PAGE', 12);
+
 /**
  * Widget to show a list of profiles
  *
diff --git a/lib/profileminilist.php b/lib/profileminilist.php
index 049754f721..18f7cb3c8b 100644
--- a/lib/profileminilist.php
+++ b/lib/profileminilist.php
@@ -33,7 +33,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 require_once INSTALLDIR.'/lib/profilelist.php';
 
-define('PROFILES_PER_MINILIST', 8);
+define('PROFILES_PER_MINILIST', MINILIST_PER_PAGE);
 
 /**
  * Widget to show a list of profiles, good for sidebar
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 55d1e8e91a..9330363f73 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -648,7 +648,6 @@ address .poweredby {
 
 #core .vcard .photo {
     display: inline;
-    margin-right: 11px;
     float: left;
 }
 
@@ -660,8 +659,8 @@ address .poweredby {
 }
 
 #content .notice .entry-title {
-    margin: 2px 7px 0px 59px;
-    min-height: 35px;
+    margin: 2px 7px 0px 75px;
+    min-height: 51px;
 }
 
 .vcard .url {
@@ -726,7 +725,7 @@ font-style:italic;
 .notice div.entry-content {
     clear:left;
     float:left;
-    margin-left:59px;
+    margin-left:75px;
     margin-top: 10px;
 }
 
@@ -858,7 +857,7 @@ content: ":";
     clear: both;
     float: left;
     width: 458px;
-    margin-left: 59px;
+    margin-left: 75px;
     margin-top: 10px;
     margin-bottom: 10px;
     padding-right: 2px;
@@ -894,19 +893,19 @@ content: ":";
 }
 
 #content .threaded-replies .notice .author .photo {
-    height: 24px;
-    width: 24px;
+    height: 48px;
+    width: 48px;
     top: 12px;
 }
 
 #content .notice .threaded-replies .notice .entry-title {
-    margin: 2px 7px 0px 35px;
+    margin: 2px 7px 0px 57px;
 }
 
 #content .notice .threaded-replies .notice div.entry-content {
     clear:left;
     float:left;
-    margin-left: 35px;
+    margin-left: 57px;
     margin-top: 6px !important;
 }
 
@@ -987,7 +986,7 @@ content: ":";
 }
 
 #conversation .notices .threaded-replies {
-    margin-left: 59px;
+    margin-left: 75px;
     background: #fafafa;
 }
 
@@ -1902,7 +1901,7 @@ clear:none;
 .profile .entity_profile .url,
 .profile .entity_profile .entity_tags,
 .profile .entity_profile .form_subscription_edit {
-margin-left:59px;
+margin-left:75px;
 clear:none;
 display:block;
 width:auto;
diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css
index cd3b46c9e0..20d72bddf6 100644
--- a/theme/neo/css/display.css
+++ b/theme/neo/css/display.css
@@ -346,9 +346,9 @@ h6 {font-size: 1em;}
 }
 
 .section .entities li {
-    margin-right: 3.6px;
-    margin-bottom: 5px;
-    width: 24px;
+    margin-right: 4px;
+    margin-bottom: 4px;
+    width: 32px;
 }
 
 #popular_notices .avatar {
@@ -366,7 +366,11 @@ h6 {font-size: 1em;}
     line-height: 1.6em;
 }
 
-.section .avatar {
+.section .author .avatar, .notice .author .avatar {
+    border-radius: 5%;
+    box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.5);
+}
+.section .author .avatar {
     box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
 }
 
@@ -458,10 +462,6 @@ h6 {font-size: 1em;}
     min-width: 80px;
 }
 
-#content .threaded-replies .notice .author .photo {
-    box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
-}
-
 .user_in.realtime-popup .notice div.entry-content {
     max-width: 320px;
 }