--- kdebase-3.5.7/kicker/libkicker/kickerSettings.kcfg.menu_button_switch	2007-09-18 11:48:39.000000000 -0300
+++ kdebase-3.5.7/kicker/libkicker/kickerSettings.kcfg	2007-09-18 11:48:51.000000000 -0300
@@ -103,6 +103,11 @@
       <default>false</default>
    </entry>
 
+<entry name="DefaultKButton" type="Bool" >
+      <label>When this option is enabled, the classic K Menu button is used.</label>
+      <default>false</default>
+   </entry>
+
 <entry name="OpenOnHover" type="Bool" >
       <label>When this option is enabled, the Kickoff Menu does open on mouse hover.</label>
       <default>true</default>
@@ -362,6 +367,21 @@
       <default>Applications</default>
 </entry>
 
+<entry name="KMenuIcon" key="KMenuIcon" type="String" >
+      <label>Icon to be shown on K Menu Button</label>
+      <default>kmenu</default>
+</entry>
+
+<entry name="KMenuButtonRotate" key="KMenuButtonRotate" type="Bool" >
+      <label>Enable rotation in the K Menu Button</label>
+      <default>true</default>
+</entry>
+
+<entry name="KMenuButtonScale" key="KMenuButtonScale" type="Bool" >
+      <label>Enable scaling in the K Menu Button</label>
+      <default>true</default>
+</entry>
+
 <entry name="KMenuTextRelativeXPos" key="TextRelativeXPos" type="UInt" >
       <label>Relative horizontal position of text</label>
       <default>0</default>
--- kdebase-3.5.7/kicker/kicker/ui/appletop_mnu.h.menu_button_switch	2007-09-18 11:34:11.000000000 -0300
+++ kdebase-3.5.7/kicker/kicker/ui/appletop_mnu.h	2007-09-18 11:34:12.000000000 -0300
@@ -49,6 +49,7 @@ signals:
 
 protected slots:
     void toggleLegacy();
+    void toggleIcon();
 
 protected:
     void keyPressEvent(QKeyEvent* e);
--- kdebase-3.5.7/kicker/kicker/ui/appletop_mnu.cpp.menu_button_switch	2007-09-18 11:34:11.000000000 -0300
+++ kdebase-3.5.7/kicker/kicker/ui/appletop_mnu.cpp	2007-09-18 11:34:12.000000000 -0300
@@ -172,6 +172,11 @@ PanelAppletOpMenu::PanelAppletOpMenu(int
           insertItem(SmallIcon("about_kde"), i18n("Switch to KDE Menu Style"), this, SLOT(toggleLegacy()));
         else
           insertItem(SmallIcon("menuk-mdk"), i18n("Switch to Kickoff Menu Style"), this, SLOT(toggleLegacy()));
+
+		if (KickerSettings::defaultKButton())
+		   insertItem(SmallIcon("menuk-mdk"), i18n("Switch to Mandriva Button"), this, SLOT(toggleIcon()));
+	    else
+		   insertItem(SmallIcon("about_kde"), i18n("Switch to Default KDE Button"), this, SLOT(toggleIcon()));
     }
 
     if ((actions & PanelAppletOpMenu::KMenuEditor) && kapp->authorizeKAction("menuedit"))
@@ -227,4 +232,21 @@ void PanelAppletOpMenu::toggleLegacy()
     Kicker::the()->restart();
 }
 
+void PanelAppletOpMenu::toggleIcon()
+{
+	bool legacy = !KickerSettings::defaultKButton();
+
+
+	KickerSettings::setDefaultKButton(legacy);
+	KickerSettings::setShowKMenuText(!legacy);
+	KickerSettings::setKMenuButtonScale(true);
+	KickerSettings::setKMenuButtonRotate(!legacy);
+	if (legacy)
+		KickerSettings::setKMenuIcon("kmenu");
+	else
+		KickerSettings::setKMenuIcon("mdv_kmenu");
+    KickerSettings::writeConfig();
+    Kicker::the()->restart();
+}
+
 #include "appletop_mnu.moc"