diff --git a/.gitattributes b/.gitattributes
index 71c7c7b75673aa0e1a5d9e7042716d1340a188a4..d397fea228f405453b1b46054b013a24ad4875e5 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1016,6 +1016,7 @@ prive/themes/spip/images/site-edit-16.png -text
 prive/themes/spip/images/site-edit-24.png -text
 prive/themes/spip/images/site-new-16.png -text
 prive/themes/spip/images/site-new-24.png -text
+prive/themes/spip/images/squelette-48.png -text
 prive/themes/spip/images/statistique-16.png -text
 prive/themes/spip/images/statistique-24.png -text
 prive/themes/spip/images/suivi-16.png -text
diff --git a/ecrire/action/converser.php b/ecrire/action/converser.php
index a38c35368ab8e803489f36f53a421f3fe6f84d6d..ac879304ab961bcf6719fbc65c4e073ec158e2d9 100644
--- a/ecrire/action/converser.php
+++ b/ecrire/action/converser.php
@@ -20,8 +20,14 @@ include_spip('inc/cookie');
 // http://doc.spip.org/@action_converser_dist
 function action_converser_dist()
 {
+	$update_session = false;
+	if ( _request('arg') AND spip_connect()) {
+		$securiser_action = charger_fonction('securiser_action', 'inc');
+		$securiser_action();
+		$update_session = true;
+	}
 
-	$lang = action_converser_changer_langue();
+	$lang = action_converser_changer_langue($update_session);
 	$redirect = rawurldecode(_request('redirect'));
 
 	if (!$redirect) $redirect = _DIR_RESTREINT_ABS;
@@ -29,14 +35,11 @@ function action_converser_dist()
 	redirige_par_entete($redirect, true);
 }
 
-function action_converser_changer_langue(){
+function action_converser_changer_langue($update_session){
 	if ($lang = _request('var_lang'))
 		action_converser_post($lang);
 	elseif ($lang = _request('var_lang_ecrire')) {
-		if ( _request('arg') AND spip_connect()) {
-			$securiser_action = charger_fonction('securiser_action', 'inc');
-			$securiser_action();
-
+		if ($update_session) {
 			sql_updateq("spip_auteurs", array("lang" => $lang), "id_auteur = " . $GLOBALS['visiteur_session']['id_auteur']);
 			$GLOBALS['visiteur_session']['lang'] = $lang;
 			$session = charger_fonction('session', 'inc');
diff --git a/ecrire/inc/bandeau.php b/ecrire/inc/bandeau.php
index b14ba85b503a0c8965d064f63660fc9163d786e3..f2d489b25a21e405f28eb6345fbe9d5edc1e38cc 100644
--- a/ecrire/inc/bandeau.php
+++ b/ecrire/inc/bandeau.php
@@ -63,7 +63,7 @@ function boutons_core($type='bouton'){
  * @return array
  */
 function definir_barre_boutons($contexte=array(),$icones = true, $autorise = true) {
-	include_spip('inc/autoriser');
+    include_spip('inc/autoriser');
 	$boutons_admin=array();
 
 	// les boutons du core, issus de prive/navigation.xml
@@ -80,7 +80,7 @@ function definir_barre_boutons($contexte=array(),$icones = true, $autorise = tru
 			if ($parent AND isset($boutons_admin[$parent])){
 				if (!is_array($boutons_admin[$parent]->sousmenu))
 					$boutons_admin[$parent]->sousmenu = array();
-				$position = $infos['position']?$infos['position']:count($boutons_admin[$parent]->sousmenu);
+				$position = (strlen($infos['position'])?intval($infos['position']):count($boutons_admin[$parent]->sousmenu));
 				$boutons_admin[$parent]->sousmenu = array_slice($boutons_admin[$parent]->sousmenu,0,$position)
 				+ array($id=> new Bouton(
 					($icones AND $infos['icone'])?find_in_theme($infos['icone']):'',  // icone
@@ -151,7 +151,7 @@ function bando_lister_sous_menu($sousmenu,$contexte=null,$class="",$image=false)
 			$url = bandeau_creer_url($sousdetail->url?$sousdetail->url:$souspage, $sousdetail->urlArg, $contexte);
 			if (!$image){
 					$sous .= "<li$class>"
-			 . "<a href='$url' id='bando2_$souspage'>"
+			 . "<a href='$url' class='bando2_$souspage'>"
 			 . _T($sousdetail->libelle)
 			 . "</a>"
 			 . "</li>";
@@ -159,7 +159,7 @@ function bando_lister_sous_menu($sousmenu,$contexte=null,$class="",$image=false)
 			else {
 					//$image = "<img src='".$sousdetail->icone."' width='".largeur($sousdetail->icone)."' height='".hauteur($sousdetail->icone)."' alt='".attribut_html(_T($sousdetail->libelle))."' />";
 					$sous .= "<li$class>"
-			 . "<a href='$url' id='bando2_$souspage' title='".attribut_html(_T($sousdetail->libelle))."'>"
+			 . "<a href='$url' class='bando2_$souspage' title='".attribut_html(_T($sousdetail->libelle))."'>"
 			 . "<span>"._T($sousdetail->libelle)."</span>"
 			 . "</a>"
 			 . "</li>";
@@ -216,7 +216,7 @@ function bando_navigation($boutons, $contexte = array())
 function bando_identite(){
 
 	$nom_site = typo($GLOBALS['meta']['nom_site']);
-	$img_info = find_in_theme('images/information-16.png');
+	$img_info = find_in_theme('images/information-24.png');
 	$url_config_identite = generer_url_ecrire('config_identite');
 
 	$res = "";
@@ -232,8 +232,9 @@ function bando_identite(){
 	  generer_url_ecrire("infos_perso")
 	  ."'>"
 	  . "<strong class='nom'>$moi</strong>"
-	  . " <img alt='"._T('icone_informations_personnelles')."' src='$img_info'/></a>"
-	  . "| "
+	  //. " <img alt='"._T('icone_informations_personnelles')."' src='$img_info'/>"
+	  . "</a>"
+	  . " | "
 	  . "<a class='menu_lang' href='$url_lang' title='"._T('titre_config_langage')."'><img alt='"._T('titre_config_langage')."' src='$img_langue'/>".traduire_nom_langue($GLOBALS['spip_lang'])."</a>"
 	  . " | "
 	  . "<a class='aide' onclick=\"window.open('$url_aide', 'spip_aide', 'scrollbars=yes,resizable=yes,width=740,height=580');return false;\" href='$url_aide'>"._T('icone_aide_ligne')."</a>"
@@ -244,9 +245,10 @@ function bando_identite(){
 
 	// informations sur le site
 	$res .= "<p class='nom_site_spip'>"
-	  . "<a class='info' title='Informations sur $nom_site' href='$url_config_identite'>"
+	  . "<a class='info' title='Informations sur ".attribut_html($nom_site)."' href='$url_config_identite'>"
 	  . "<strong class='nom'> $nom_site </strong>"
-	  . "<img alt='Informations sur $nom_site' src='$img_info' /></a>"
+	  //. "<img alt='Informations sur ".textebrut($nom_site)."' src='$img_info' />"
+	  ."</a>"
 	  . "| "
 	  . "<a class='voir' href='"._DIR_RACINE."'>"._T('icone_visiter_site')."</a>"
 	  . "</p>";
@@ -268,7 +270,7 @@ function bando_outils_rapides($boutons, $contexte = array()){
 
 	// le navigateur de rubriques
 	$img = find_in_theme('images/boussole-24.png');
-	$url = generer_url_ecrire("brouteur");
+	$url = generer_url_ecrire("articles_tous");
 	$res .= "<ul class='bandeau_rubriques deroulant'><li class='boussole'>";
 	$res .= "<a href='$url' id='boutonbandeautoutsite'><img src='$img' width='24' height='24' alt='' /></a>";
 	include_spip('exec/menu_rubriques');
@@ -284,11 +286,13 @@ function bando_outils_rapides($boutons, $contexte = array()){
 	$res .= "<div id='rapides'>";
 
 	// la barre de raccourcis collaboratifs
-	if (isset($boutons['outils_collaboratifs']))
+	if (isset($boutons['outils_collaboratifs'])) {
+		$sous_menu = bando_lister_sous_menu($boutons['outils_collaboratifs']->sousmenu,$contexte,'bouton',true);
+		if ($sous_menu)
 			$res .= "<ul class='rapides collaborer'>"
-				. bando_lister_sous_menu($boutons['outils_collaboratifs']->sousmenu,$contexte,'bouton',true)
+				. $sous_menu
 				. "</ul>";
-
+	}
 	$res .= formulaire_recherche("recherche")."</div>";
 
 	return "<div id='bando_outils'><div class='largeur'>\n$res<div class='nettoyeur'></div></div></div>";
@@ -324,7 +328,8 @@ function inc_bandeau_dist($rubrique, $sous_rubrique, $largeur)
 		;
 
 }
-// Pour memoire
+
+// Pour memoire, a eleminier definitivement
 define('_LARGEUR_ICONES_BANDEAU',
 	((@$GLOBALS['spip_display'] == 3) ? 60 : 80)
 	+ ((@$GLOBALS['spip_ecran'] == 'large') ? 30 : 0)
diff --git a/ecrire/inc/boutons.php b/ecrire/inc/boutons.php
index 223271c7da26b14c0b33c2c61c98636e2ceee9ac..52649408f32bbecd2c33e0b6918357e1a21042ed 100644
--- a/ecrire/inc/boutons.php
+++ b/ecrire/inc/boutons.php
@@ -73,6 +73,23 @@ function barre_onglets_config_lang() {
 	return $onglets;
 }
 
+
+function barre_onglets_plugins() {
+
+	$onglets=array();
+	$onglets['plugins_actifs']=
+		  new Bouton('plugin-24.gif', 'plugins_actifs_liste',
+			generer_url_ecrire("admin_plugin"));
+	$onglets['admin_plugin']=
+		  new Bouton('plugin-24.gif', 'plugins_liste',
+			generer_url_ecrire("admin_plugin","voir=tous"));
+	$onglets['charger_plugin']=
+		  new Bouton('spip-pack-24.png', 'plugin_titre_automatique_ajouter',
+			generer_url_ecrire("charger_plugin"));
+	return $onglets;
+}
+
+
 /**
  * definir la liste des onglets dans une page de l'interface privee
  * on passe la main au pipeline "ajouter_onglets".
diff --git a/ecrire/inc/commencer_page.php b/ecrire/inc/commencer_page.php
index c10fc95a0a4923007ec8704c4f15bee4712652b7..2e7bc04e33cd2841861c84dafd7100e5b398dcb3 100644
--- a/ecrire/inc/commencer_page.php
+++ b/ecrire/inc/commencer_page.php
@@ -76,17 +76,18 @@ function init_body($rubrique='accueil', $sous_rubrique='accueil', $id_rubrique='
 		: 'navigation_avec_icones';
 	$GLOBALS['spip_ecran'] = isset($_COOKIE['spip_ecran']) ? $_COOKIE['spip_ecran'] : "etroit";
 
-	if ($GLOBALS['spip_ecran'] == "large") $largeur = 974; else $largeur = 750;
-	$res = pipeline('body_prive',"<body class='ecrire "
+	$res = pipeline('body_prive',"<body class='"
 			. $GLOBALS['spip_ecran'] . " $spip_display_navigation $rubrique $sous_rubrique "._request('exec')."'"
 			. ($GLOBALS['spip_lang_rtl'] ? " dir='rtl'" : "")
 			.'>');
 
 	if (!$menu) return $res;
 
+
 	$bandeau = charger_fonction('bandeau', 'inc');
 
-	return $res . $bandeau($rubrique, $sous_rubrique, $largeur);
+	return $res
+	 . $bandeau($rubrique, $sous_rubrique, $largeur);
 }
 
 // http://doc.spip.org/@avertissement_messagerie
@@ -177,4 +178,4 @@ function lien_change_var($lien, $set, $couleur, $coords, $titre, $mouseOver="")
 }
 
 
-?>
+?>
\ No newline at end of file
diff --git a/ecrire/inc/filtres.php b/ecrire/inc/filtres.php
index 26c4cbd15aa7282accc0adb55f5da5adfe7781eb..ca9daa15fe4ba1f9efd9ed3ac89a92b3bbbc80a1 100644
--- a/ecrire/inc/filtres.php
+++ b/ecrire/inc/filtres.php
@@ -2518,7 +2518,7 @@ function bando_images_background(){
 		if (is_array($detail->sousmenu))
 			foreach($detail->sousmenu as $souspage=>$sousdetail)
 				if ($sousdetail->icone AND strlen(trim($sousdetail->icone)))
-					$res .="\n$selecteur#bando2_$souspage {background-image:url(".$sousdetail->icone.");}";
+					$res .="\n$selecteur.bando2_$souspage {background-image:url(".$sousdetail->icone.");}";
 	}
 	return $res;
 }
diff --git a/ecrire/lang/ecrire_fr.php b/ecrire/lang/ecrire_fr.php
index 9cbf0c280207926b8f1413a93c095e9686619203..723f80bdc980e9d44c235cf00ea48729113fd248 100644
--- a/ecrire/lang/ecrire_fr.php
+++ b/ecrire/lang/ecrire_fr.php
@@ -218,7 +218,7 @@ $GLOBALS[$GLOBALS['idx_lang']] = array(
 'icone_activer_cookie' => 'Activer le cookie de correspondance',
 'icone_activite' => 'Activit&eacute;',
 'icone_admin_plugin' => 'Gestion des plugins',
-'icone_administration' => 'Administration',
+'icone_administration' => 'Maintenance',
 'icone_afficher_auteurs' => 'Afficher les auteurs',
 'icone_afficher_visiteurs' => 'Afficher les visiteurs',
 'icone_arret_discussion' => 'Ne plus participer &agrave; cette discussion',
@@ -254,6 +254,7 @@ $GLOBALS[$GLOBALS['idx_lang']] = array(
 'icone_relancer_signataire' => 'Relancer le signataire',
 'icone_retour' => 'Retour',
 'icone_retour_article' => 'Retour &agrave; l\'article',
+'icone_squelette' => 'Squelettes',
 'icone_suivi_forum' => 'Suivi du forum public&nbsp;: @nb_forums@&nbsp;contribution(s)',
 'icone_suivi_publication' => 'Suivi de la publication',
 'icone_supprimer_cookie' => 'Supprimer le cookie de correspondance',
diff --git a/prive/navigation.xml b/prive/navigation.xml
index 59de2211faecb76a4d3e1a566e6ead21b836b670..705ec7ee084eb00cd8dcfdc84c12a9f6b97dced6 100644
--- a/prive/navigation.xml
+++ b/prive/navigation.xml
@@ -69,6 +69,12 @@
 		<args>statut=!1comite,0minirezo,nouveau</args>
 	</bouton>
 	
+	<bouton id="bando_squelette">
+		<icone>images/squelette-48.png</icone>
+		<titre>icone_squelette</titre>
+		<url>navigation</url>
+		<args>menu=bando_squelette</args>
+	</bouton>
 	
 	<bouton id="bando_administration">
 		<icone>images/administration-48.png</icone>
diff --git a/prive/style_prive.html b/prive/style_prive.html
index dc38b5b9e2b547b1eb1ec4cb676739be4d825861..9262ba67025765c33b3b8ee145ccbdc15fbb1e31 100644
--- a/prive/style_prive.html
+++ b/prive/style_prive.html
@@ -138,9 +138,9 @@ td { text-align: #GET{left}; }
 #bando_haut ul.deroulant li:hover, #bando_haut ul.deroulant li.actif,#bando_haut ul.deroulant li.actif_tempo { background-color: #[(#GET{claire}|couleur_eclaircir|couleur_eclaircir)]; }
 #bando_haut ul.deroulant li ul {border: 1px solid #aaaaaa; border-top: 0; text-align:#GET{left}; height: auto; width: auto; display: block; position:absolute; #GET{left}:-3000em; z-index: 99; }
 #bando_haut ul.deroulant li:hover ul, #bando_haut ul.deroulant li.actif ul, #bando_haut ul.deroulant li.actif_tempo ul { #GET{left}:auto;}
-#bando_haut ul.deroulant li a { display: block; }
+#bando_haut ul.deroulant li a { display: block;  color:#444; font-weight:bold;}
 #bando_haut ul.deroulant li ul li { background-color: #fff; }
-#bando_haut ul.deroulant li ul li a { font-weight: normal; }
+#bando_haut ul.deroulant li ul li a {  }
 #bando_haut ul.deroulant li ul li a:hover,
 #bando_haut ul.deroulant li ul li a:focus { background-color: #[(#GET{claire}|couleur_eclaircir|couleur_eclaircir)]; }
 
@@ -212,8 +212,8 @@ td { text-align: #GET{left}; }
 #bando_outils #rapides .spip_recherche .recherche {margin-bottom:0;margin-top:1px;}
 #bando_outils #rapides .spip_recherche .submit {vertical-align:bottom;}
 
-#bando_navigation ul li {width:105px; text-align: center; }
-#bando_navigation ul li ul li {width: auto; min-width: 80px; float:none;text-align:#GET{left};position:static;}
+#bando_navigation ul li {min-width:85px; max-width:115px; text-align:center;border-#GET{right}: 1px solid #eee; }
+#bando_navigation ul li ul li {width: auto; min-width: 85px; max-width:250px; float:none;text-align:#GET{left};position:static;}
 
 #bando_navigation { position: relative; }
 #bando_navigation { clear:both; background: #fff; padding-top: 3px; border-bottom: 1px solid #aaa; }
@@ -221,7 +221,8 @@ td { text-align: #GET{left}; }
 #bando_navigation ul li a:hover,
 #bando_navigation ul li a:focus { text-decoration: underline; }
 
-#bando_navigation ul.deroulant > li > a { color:#333;}
+#bando_navigation ul li.first { border-#GET{left}: 1px solid #eee;}
+#bando_navigation ul.deroulant > li > a { color:#333; }
 
 
 /* pour les icones pochoir de diala */
diff --git a/prive/themes/spip/images/accueil-48.png b/prive/themes/spip/images/accueil-48.png
index cec59fed65fb4a8b96ff720833f6b7497136cff7..19b3bee7ee8472a006dc1bb69b1e203de007c24e 100644
Binary files a/prive/themes/spip/images/accueil-48.png and b/prive/themes/spip/images/accueil-48.png differ
diff --git a/prive/themes/spip/images/administration-48.png b/prive/themes/spip/images/administration-48.png
index fc3981f7d4dc27edf63299a4c27e4749ffc0b8fe..d523e6c422e1d174cec00bd0e988626bbb6c38c5 100644
Binary files a/prive/themes/spip/images/administration-48.png and b/prive/themes/spip/images/administration-48.png differ
diff --git a/prive/themes/spip/images/configuration-48.png b/prive/themes/spip/images/configuration-48.png
index aed0c5caa0917f5fdb8b0e0db9165c35e20975f2..1e64c07b31c8f6a552beee32e6c510e1e0217217 100644
Binary files a/prive/themes/spip/images/configuration-48.png and b/prive/themes/spip/images/configuration-48.png differ
diff --git a/prive/themes/spip/images/edition-48.png b/prive/themes/spip/images/edition-48.png
index b34064ced4e8cd477e015cff59a989ba041d94a6..9449046e6519baeddc58f89a39ad3e0f97d6f9d0 100644
Binary files a/prive/themes/spip/images/edition-48.png and b/prive/themes/spip/images/edition-48.png differ
diff --git a/prive/themes/spip/images/publication-48.png b/prive/themes/spip/images/publication-48.png
index 83dfa4bcf04981cf84c8f1d85b63a33fc825cd93..0fc06a59ede57f8fbc66dba702c4881e60ed7989 100644
Binary files a/prive/themes/spip/images/publication-48.png and b/prive/themes/spip/images/publication-48.png differ
diff --git a/prive/themes/spip/images/squelette-48.png b/prive/themes/spip/images/squelette-48.png
new file mode 100644
index 0000000000000000000000000000000000000000..496fac455df8831354ae23daa889def38bac9a52
Binary files /dev/null and b/prive/themes/spip/images/squelette-48.png differ