diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 39178ab3874..bf9c98dc903 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -288,7 +288,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
     $var=!$var;
     print '<tr '.$bc[$var].'><td colspan="'.$colspan.'">';
 
-    print '<table class="nobordernopadding" width="100%">';
+    print '<table class="nobordernopadding" width="100%"><tr><td><div align="center">';
 
     $i=0;
     foreach($dirthemes as $dir)
@@ -310,22 +310,15 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
     					// Disable not stable themes
     					//if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/bureau2crea/i',$subdir)) continue;
 
-    					if ($i % $thumbsbyrow == 0)
-    					{
-    						print '<tr '.$bc[$var].'>';
-    					}
-
-    					print '<td align="center">';
+    					print '<div class="inline-block" style="margin-top: 10px; margin-bottom: 10px; margin-right: 20px; margin-left: 20px;">';
     					$file=$dirtheme."/".$subdir."/thumb.png";
     					$url=$urltheme."/".$subdir."/thumb.png";
     					if (! file_exists($file)) $url=$urltheme."/common/nophoto.jpg";
-    					print '<table><tr><td>';
     					print '<a href="'.$_SERVER["PHP_SELF"].($edit?'?action=edit&theme=':'?theme=').$subdir.(GETPOST("optioncss")?'&optioncss='.GETPOST("optioncss",'alpha',1):'').($fuser?'&id='.$fuser->id:'').'" style="font-weight: normal;" alt="'.$langs->trans("Preview").'">';
     					if ($subdir == $conf->global->MAIN_THEME) $title=$langs->trans("ThemeCurrentlyActive");
     					else $title=$langs->trans("ShowPreview");
-    					print '<img src="'.$url.'" border="0" width="80" height="60" alt="'.$title.'" title="'.$title.'">';
-    					print '</a>';
-    					print '</td></tr><tr><td align="center">';
+    					print '<img src="'.$url.'" border="0" width="80" height="60" alt="'.$title.'" title="'.$title.'" style="margin-bottom: 5px;">';
+    					print '</a><br>';
     					if ($subdir == $selected_theme)
     					{
     						print '<input '.($edit?'':'disabled').' type="radio" '.$bc[$var].' style="border: 0px;" checked name="main_theme" value="'.$subdir.'"> <b>'.$subdir.'</b>';
@@ -334,27 +327,16 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
     					{
     						print '<input '.($edit?'':'disabled').' type="radio" '.$bc[$var].' style="border: 0px;" name="main_theme" value="'.$subdir.'"> '.$subdir;
     					}
-    					print '</td></tr></table></td>';
+						print '</div>';
 
     					$i++;
-
-    					if ($i % $thumbsbyrow == 0) print '</tr>';
     				}
     			}
     		}
     	}
     }
 
-    if ($i % $thumbsbyrow != 0)
-    {
-        while ($i % $thumbsbyrow != 0)
-        {
-            print '<td>&nbsp;</td>';
-            $i++;
-        }
-        print '</tr>';
-    }
-    print '</table>';
+    print '</div></td></tr></table>';
 
     print '</td></tr>';
     print '</table>';
diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php
index 62f727c5ce8..b3407c17c9a 100644
--- a/htdocs/theme/amarok/style.css.php
+++ b/htdocs/theme/amarok/style.css.php
@@ -1283,7 +1283,6 @@ tr.box_titre td.boxclose {
 tr.liste_titre td, tr.liste_titre th, form.liste_titre div {
 	padding:2px;
 	padding-left:2px !important;
-	white-space:nowrap;
 	text-shadow:1px 1px 1px #ffffff;
 }
 
diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php
index 702b02bad49..7942eb87bb9 100644
--- a/htdocs/theme/auguria/style.css.php
+++ b/htdocs/theme/auguria/style.css.php
@@ -1391,7 +1391,6 @@ div.liste_titre, tr.liste_titre, form.liste_titre
     color: #FFFFFF;
     font-family: <?php print $fontlist ?>;
     /* border-bottom: 1px solid #FDFFFF; */
-    white-space: nowrap;
     text-align: <?php echo $left; ?>;
 }
 th.liste_titre, td.liste_titre