diff -Naur ezoe_20091020/design/standard/templates/content/datatype/edit/ezxmltext_ezoe.tpl ezoe/design/standard/templates/content/datatype/edit/ezxmltext_ezoe.tpl
--- ezoe_20091020/design/standard/templates/content/datatype/edit/ezxmltext_ezoe.tpl	2009-10-20 17:59:49.000000000 +0200
+++ ezoe/design/standard/templates/content/datatype/edit/ezxmltext_ezoe.tpl	2009-10-20 18:06:03.000000000 +0200
@@ -18,6 +18,7 @@
          $skin        = ezini('EditorSettings', 'Skin', 'ezoe.ini',,true() )
          $format_list = ezini('EditorSettings', 'Formats', 'ezoe.ini',,true() )
          $style_list  = ezini('EditorSettings', 'Styles', 'ezoe.ini',,true() )
+         $floating_toolbar = ezini('EditorLayout', 'FloatingToolbar', 'ezoe.ini',,true() )
          $skin_variant = ''
          $content_css_list_temp = ezini('StylesheetSettings', 'EditorCSSFileList', 'design.ini',,true())
          $content_css_list = array()
@@ -81,7 +82,7 @@
         theme_advanced_statusbar_location: "bottom",
         theme_advanced_toolbar_location : "top",
         theme_advanced_toolbar_align : "left",
-        theme_advanced_toolbar_floating : false,
+        theme_advanced_toolbar_floating : {if $floating_toolbar}{$floating_toolbar}{else}true{/if},
         theme_advanced_resize_horizontal : false,
         theme_advanced_resizing : true,
         valid_elements: "-strong/-b/-bold[class|customattributes],-em/-i/-emphasize[class|customattributes],span[type|class|title|customattributes],pre[class|title|customattributes],ol[class|customattributes],ul[class|customattributes],li,a[href|name|target|title|class|id|customattributes],p[class|customattributes],img[src|class|alt|align|inline|id|customattributes],table[class|border|width|id|title|customattributes|ezborder|bordercolor],tr,th[class|width|rowspan|colspan|customattributes],td[class|width|rowspan|colspan|customattributes],h1,h2,h3,h4,h5,h6,br",
@@ -187,9 +188,11 @@
         eZOeAttributeSettings['ez_attribute_id'] = {$attribute.id};
         {def $counter = 1
             $comma = 0}
+        eZOeAttributeSettings['theme_advanced_buttons{$counter}'] = '';
         {foreach $layout_settings['buttons'] as $buttons}
             {if eq($buttons, "&")}
                 {set $counter = $counter|inc}
+                eZOeAttributeSettings['theme_advanced_buttons{$counter}'] = '';
             {else}
                 {if ne($counter, $comma)}
                     {set $comma = $counter}
diff -Naur ezoe_20091020/ezxmltext/handlers/input/ezoexmlinput.php ezoe/ezxmltext/handlers/input/ezoexmlinput.php
--- ezoe_20091020/ezxmltext/handlers/input/ezoexmlinput.php	2009-09-18 18:29:53.000000000 +0200
+++ ezoe/ezxmltext/handlers/input/ezoexmlinput.php	2009-10-22 10:38:06.000000000 +0200
@@ -1265,6 +1265,10 @@
                         }
 
                         $output .= '<img '. $styleString .' " mce_src="'.$wwwDirPrefix.'extension/ezoe/design/standard/javascript/plugins/media/img/trans.gif" src="'.$wwwDirPrefix.'extension/ezoe/design/standard/javascript/plugins/media/img/trans.gif" ';
+                        if ( $align )
+                        {
+                            $output .= ' align="' . $align . '"';
+                        }
                         foreach ( $tag->attributes as $attribute )
                         {
                             if ( $attribute->namespaceURI == 'http://ez.no/namespaces/ezpublish3/custom/' )
diff -Naur ezoe_20091020/settings/ezoe.ini ezoe/settings/ezoe.ini
--- ezoe_20091020/settings/ezoe.ini	2009-09-18 18:30:45.000000000 +0200
+++ ezoe/settings/ezoe.ini	2009-10-20 18:07:22.000000000 +0200
@@ -208,6 +208,8 @@
 # needs the emotions plugin in order to work
 #Buttons[]=emotions
 
+# If set to false, you can use "&" symbol for buttons to make your own line of buttons
+FloatingToolbar=true
 
 # Toolbar location, possible values: top / bottom / none
 ToolbarLocation=top