diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml
index 4352b78550b..570f0195cc8 100644
--- a/addons/account/views/account_view.xml
+++ b/addons/account/views/account_view.xml
@@ -17,7 +17,8 @@
                              <field name="code" placeholder="code"/>
                              <field name="user_type_id" widget="selection"/>
                              <field name="tax_ids" widget="many2many_tags"/>
-                             <field name="tag_ids" widget="many2many_tags" domain="[('applicability', '!=', 'taxes')]" context="{'default_applicability': 'accounts'}"/>
+                             <field name="tag_ids" widget="many2many_tags" domain="[('applicability', '!=', 'taxes')]" context="{'default_applicability': 'accounts'}" options="
+                             {'no_create_edit': True}"/>
                              <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
                              <field name="currency_id" options="{'no_create': True}" groups="base.group_multi_currency"/>
                              <field name="internal_type" invisible="1" readonly="1"/>
@@ -397,6 +398,30 @@
            res_model="account.move.line"
            src_model="account.journal"/>
 
+        <!-- Tags -->
+        <record id="account_tag_view_form" model="ir.ui.view">
+            <field name="name">Tags</field>
+            <field name="model">account.account.tag</field>
+            <field name="arch" type="xml">
+                <form string="Tags">
+                    <group>
+                        <field name="name"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record id="account_tag_action" model="ir.actions.act_window">
+            <field name="name">Tags</field>
+            <field name="res_model">account.account.tag</field>
+            <field name="view_type">form</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to add a new tag.
+              </p>
+            </field>
+        </record>
+        <menuitem id="account_tag_menu" parent="account_account_menu" action="account_tag_action" groups="base.group_no_one"/>
+
         <!-- Bank statement -->
 
         <record id="view_account_bnk_stmt_cashbox" model="ir.ui.view">
diff --git a/addons/calendar/calendar_view.xml b/addons/calendar/calendar_view.xml
index 50015b7a0ee..2cf77cd2162 100644
--- a/addons/calendar/calendar_view.xml
+++ b/addons/calendar/calendar_view.xml
@@ -115,7 +115,8 @@
                                     <field name="allday"  on_change="onchange_allday(start, stop, start_date, stop_date, start_datetime, stop_datetime, allday)"/>
                                 </group>
                                 <group>
-                                    <field name="categ_ids" widget="many2many_tags" />
+                                    <field name="categ_ids" widget="many2many_tags" options="
+                                    {'no_create_edit': True}"/>
                                     <field name="alarm_ids" widget="many2many_tags" />
                                     <field name="location" />
                                 </group>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index e9d1b33e0ee..d0f78e9cf40 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -121,7 +121,7 @@
                         </group>
                         <group>
                             <field name="priority" widget="priority"/>
-                            <field name="tag_ids" widget="many2many_tags"/>
+                            <field name="tag_ids" widget="many2many_tags" options="{'no_create_edit': True}"/>
                         </group>
                     </group>
                     <notebook>
@@ -441,7 +441,7 @@
                             </group>
                             <group>
                                 <field name="priority" widget="priority"/>
-                                <field name="tag_ids" widget="many2many_tags"/>
+                                <field name="tag_ids" widget="many2many_tags" options="{'no_create_edit': True}"/>
                                 <field name="lost_reason" attrs="{'invisible': [('active', '=', True)]}"/>
                                 <field name="date_conversion" invisible="1"/>
                             </group>
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index b88beedbfd9..bc2ce383a9a 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -246,7 +246,7 @@
                                 <field name="license_plate" class="oe_inline" placeholder="e.g. PAE 326"/>
                             </h2>
                             <label for="tag_ids" class="oe_edit_only"/>
-                            <field name="tag_ids" widget="many2many_tags" />
+                            <field name="tag_ids" widget="many2many_tags" options="{'no_create_edit': True}"/>
                         </div>
                         <group col="2" string="General Properties">
                             <group >
@@ -858,6 +858,31 @@
 
         <menuitem action="fleet_vehicle_log_services_act" parent="fleet_vehicles" id="fleet_vehicle_log_services_menu" groups="group_fleet_user"/>
 
+        <record id="fleet_vehicle_tag_view_form" model="ir.ui.view">
+            <field name="name">fleet.vehicle.tag.form</field>
+            <field name="model">fleet.vehicle.tag</field>
+            <field name="arch" type="xml">
+                <form string="Vehicle Tags">
+                    <group>
+                        <field name="name"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="fleet_vehicle_tag_action" model="ir.actions.act_window">
+            <field name="name">Vehicle Tags</field>
+            <field name="res_model">fleet.vehicle.tag</field>
+            <field name="view_type">form</field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click to add a new tag.
+                </p>
+            </field>
+        </record>
+
+        <menuitem id="fleet_vehicle_tag_menu" parent="fleet_configuration" action="fleet_vehicle_tag_action" sequence="112" groups="base.group_no_one"/>
+
         <record model='ir.ui.view' id='fleet_vehicle_service_types_tree'>
             <field name="name">fleet.service.type.tree</field>
             <field name="model">fleet.service.type</field>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 600abcf1e23..fa96440aa60 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -34,7 +34,7 @@
                                 <field name="name" placeholder="Employee's Name"/>
                             </h1>
                         </div>
-                        <field name="category_ids" widget="many2many_tags" placeholder="e.g. Part Time" groups="base.group_hr_user"/>
+                        <field name="category_ids" widget="many2many_tags" placeholder="e.g. Part Time" options="{'no_create_edit': True}" groups="base.group_hr_user"/>
                         <notebook>
                             <page name="public" string="Public Information">
                                 <group>
diff --git a/addons/hr_recruitment/views/hr_recruitment_views.xml b/addons/hr_recruitment/views/hr_recruitment_views.xml
index 50d20107b3f..6639384bf24 100644
--- a/addons/hr_recruitment/views/hr_recruitment_views.xml
+++ b/addons/hr_recruitment/views/hr_recruitment_views.xml
@@ -124,7 +124,7 @@
                         </div>
                         <div>
                             <label for="categ_ids" class="oe_edit_only"/>
-                            <field name="categ_ids" widget="many2many_tags"/>
+                            <field name="categ_ids" widget="many2many_tags" options="{'no_create_edit': True}"/>
                         </div>
                     </h2>
                 </div>
@@ -623,6 +623,37 @@
         action="hr_recruitment_stage_act"
         sequence="1"/>
 
+    <!-- Tag Form View -->
+    <record id="hr_applicant_category_view_form" model="ir.ui.view">
+        <field name="name">hr.applicant.category.form</field>
+        <field name="model">hr.applicant.category</field>
+        <field name="arch" type="xml">
+            <form string="Tags">
+                <group>
+                    <field name="name"/>
+                </group>
+            </form>
+        </field>
+    </record>
+
+    <!-- Tag Action -->
+    <record id="hr_applicant_category_action" model="ir.actions.act_window">
+        <field name="name">Tags</field>
+        <field name="res_model">hr.applicant.category</field>
+        <field name="view_type">form</field>
+        <field name="help" type="html">
+            <p class="oe_view_nocontent_create">
+                Click to add a new tag.
+            </p>
+        </field>
+    </record>
+
+    <menuitem
+        id="hr_applicant_category_menu"
+        parent="menu_hr_recruitment_configuration"
+        action="hr_applicant_category_action"
+        sequence="2" groups="base.group_no_one"/>
+
     <!-- Degree Tree View -->
     <record model="ir.ui.view" id="hr_recruitment_degree_tree">
         <field name="name">hr.recruitment.degree.tree</field>
diff --git a/addons/mass_mailing/views/mass_mailing.xml b/addons/mass_mailing/views/mass_mailing.xml
index 33f378e4d27..fc12b5afd8f 100644
--- a/addons/mass_mailing/views/mass_mailing.xml
+++ b/addons/mass_mailing/views/mass_mailing.xml
@@ -690,6 +690,32 @@
             groups="mass_mailing.group_mass_mailing_campaign"
             action="action_view_mass_mailing_stages"/>
 
+        <!--  MASS MAILING CAMPAIGN TAGS !-->
+        <record id="mail_mass_mailing_tag_view_form" model="ir.ui.view">
+            <field name="name">mail.mass_mailing.tag.form</field>
+            <field name="model">mail.mass_mailing.tag</field>
+            <field name="arch" type="xml">
+                <form string="Campaign Tags">
+                    <group>
+                        <field name="name"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record id="mass_mailing_tag_action" model="ir.actions.act_window">
+            <field name="name">Campaign Tags</field>
+            <field name="res_model">mail.mass_mailing.tag</field>
+            <field name="view_type">form</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to add a new tag.
+              </p>
+            </field>
+        </record>
+
+        <menuitem id="mass_mailing_tag_menu" parent="menu_mass_mailing_configuration" action="mass_mailing_tag_action" sequence="2" groups="base.group_no_one"/>
+
+
         <!--  MASS MAILING CAMPAIGNS !-->
         <record model="ir.ui.view" id="view_mail_mass_mailing_campaign_search">
             <field name="name">mail.mass_mailing.campaign.search</field>
@@ -773,7 +799,7 @@
                         <group>
                             <field name="name" string="Campaign Name"/>
                             <field name="user_id"/>
-                            <field name="tag_ids" widget="many2many_tags"/>
+                            <field name="tag_ids" widget="many2many_tags" options="{'no_create_edit': True}"/>
                         </group>
                         <notebook>
                             <page string="Tracking">
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index ec63b4ed313..693f6792c28 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -36,6 +36,32 @@
         <field name="domain">[('user_id','=',uid)]</field>
     </record>
 
+    <!-- note Tag Form View -->
+    <record id="note_tag_view_form" model="ir.ui.view">
+      <field name="name">note.tag.form</field>
+      <field name="model">note.tag</field>
+      <field name="arch" type="xml">
+        <form string="Tags">
+          <group>
+            <field name="name"/>
+          </group>
+        </form>
+      </field>
+    </record>
+
+    <!-- note Tag Action -->
+    <record id="note_tag_action" model="ir.actions.act_window">
+      <field name="name">Tags</field>
+      <field name="res_model">note.tag</field>
+      <field name="view_type">form</field>
+      <field name="help" type="html">
+        <p class="oe_view_nocontent_create">
+          Click to add a new tag.
+        </p>
+      </field>
+    </record>
+
+
     <!-- New note Kanban View -->
     <record model="ir.ui.view" id="view_note_note_kanban">
       <field name="name">note.note.kanban</field>
@@ -114,7 +140,7 @@
                     <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" clickable="1"/>
                 </header>
                 <sheet>
-                    <field name="tag_ids" widget="many2many_tags" placeholder="Tags"/>
+                    <field name="tag_ids" widget="many2many_tags" placeholder="Tags" options="{'no_create_edit': True}"/>
                     <field name="memo" widget="html" class="oe_memo" editor_height="450px" />
                 </sheet>
                 <div class="oe_chatter">
@@ -169,6 +195,7 @@
     <menuitem name="Notes" id="menu_note_notes" sequence="3" action="note.action_note_note" web_icon="note,static/description/icon.png"/>
     <menuitem name="Configuration" id="menu_note_configuration" sequence="100" parent="menu_note_notes" groups="base.group_no_one"/>
     <menuitem name="Stages" id="menu_notes_stage" parent="menu_note_configuration" action="note.action_note_stage" sequence="21" />
+    <menuitem id="notes_tag_menu" parent="menu_note_configuration" action="note_tag_action" sequence="22"/>
 
   </data>
 </openerp>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 9efe89f3d84..9d1cdc041c3 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -272,7 +272,7 @@
                         </group>
                         <group>
                             <field name="date_deadline"/>
-                            <field name="tag_ids" widget="many2many_tags"/>
+                            <field name="tag_ids" widget="many2many_tags" options="{'no_create_edit': True}"/>
                         </group>
                     </group>
                     <notebook>
@@ -628,7 +628,7 @@
             <field name="model">project.tags</field>
             <field name="arch" type="xml">
                 <form string="Tags">
-                    <group col="4">
+                    <group>
                         <field name="name"/>
                     </group>
                 </form>
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 90126c37746..c74cbf3819e 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -189,7 +189,7 @@
                                     attrs="{'readonly': [('type', '=', 'contact'),('parent_id', '!=', False)]}"/>
                             </div>
                             <field name="website" widget="url" placeholder="e.g. www.odoo.com"/>
-                            <field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
+                            <field name="category_id" widget="many2many_tags" placeholder="Tags..." options="{'no_create_edit': True}"/>
                         </group>
                         <group>
                             <field name="function" placeholder="e.g. Sales Director"