diff --git a/data/de.haeckerfelix.gradio.gresource.xml b/data/de.haeckerfelix.gradio.gresource.xml
index 10ddc938..32fa2926 100644
--- a/data/de.haeckerfelix.gradio.gresource.xml
+++ b/data/de.haeckerfelix.gradio.gresource.xml
@@ -11,7 +11,6 @@
 	<file>ui/details-box.ui</file>
 	<file>ui/station-editor.ui</file>
 	<file>ui/groupbox.ui</file>
-	<file>ui/app-menu.ui</file>
 	<file>ui/main-window.ui</file>
 	<file>ui/player-toolbar.ui</file>
 	<file>ui/status-icon.ui</file>
diff --git a/data/ui/app-menu.ui b/data/ui/app-menu.ui
deleted file mode 100644
index 4b8aa6b4..00000000
--- a/data/ui/app-menu.ui
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <menu id="app-menu">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">Settings</attribute>
-        <attribute name="action">app.preferences</attribute>
-      </item>
-    </section>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">About</attribute>
-        <attribute name="action">app.about</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="no">radio-browser.info</attribute>
-        <attribute name="action">app.opendatabase</attribute>
-      </item>
-    </section>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">Quit</attribute>
-        <attribute name="action">app.quit</attribute>
-      </item>
-    </section>
-  </menu>
-</interface>
diff --git a/data/ui/menubutton.ui b/data/ui/menubutton.ui
index 91ac4872..59119ba2 100644
--- a/data/ui/menubutton.ui
+++ b/data/ui/menubutton.ui
@@ -1,264 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.0 -->
 <interface>
   <requires lib="gtk+" version="3.18"/>
   <object class="GtkPopoverMenu" id="MenuPopover">
     <property name="width_request">300</property>
     <property name="can_focus">False</property>
-    <child>
-      <object class="GtkBox" id="MainBox">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="border_width">12</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkBox" id="ZoomBox">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkButton" id="ZoomOutButton">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <signal name="clicked" handler="ZoomOutButton_clicked" swapped="no"/>
-                    <child>
-                      <object class="GtkImage">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">zoom-out-symbolic</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="ResetZoomButton">
-                    <property name="label">100%</property>
-                    <property name="visible">False</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="ZoomInButton">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <signal name="clicked" handler="ZoomInButton_clicked" swapped="no"/>
-                    <child>
-                      <object class="GtkImage">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">zoom-in-symbolic</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <style>
-                  <class name="linked"/>
-                </style>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSeparator">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_top">6</property>
-                <property name="margin_bottom">6</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-	    <child>
-              <object class="GtkModelButton" id="SortMButton">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="text" translatable="yes">Sorting</property>
-                <property name="menu_name">sort</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkModelButton" id="HideBrokenMButton">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-		<property name="action_name">menu.hide-broken-stations</property>
-                <property name="text" translatable="yes">Hide broken stations</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">4</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSeparator">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_top">6</property>
-                <property name="margin_bottom">6</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">5</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkModelButton" id="LibraryMButton">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="text" translatable="yes">Library</property>
-                <property name="menu_name">library</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">6</property>
-              </packing>
-            </child>
-	    <child>
-              <object class="GtkModelButton" id="CreateStationMButton">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-		<property name="action_name">menu.create-station</property>
-                <property name="text" translatable="yes">Create new radio station</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">7</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox" id="AppBox">
-                <property name="can_focus">False</property>
-                <property name="no_show_all">True</property>
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkSeparator">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="margin_top">6</property>
-                    <property name="margin_bottom">6</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkModelButton" id="SettingsMButton">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="action_name">app.preferences</property>
-                    <property name="text" translatable="yes">Settings</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkModelButton" id="OpenDatabaseMButton">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="action_name">app.opendatabase</property>
-                    <property name="text" translatable="no">radio-browser.info</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkModelButton" id="AboutMButton">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="action_name">app.about</property>
-                    <property name="text" translatable="yes">About</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkModelButton" id="QuitMButton">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="action_name">app.quit</property>
-                    <property name="text" translatable="yes">Quit</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">7</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="submenu">main</property>
-        <property name="position">3</property>
-      </packing>
-    </child>
     <child>
       <object class="GtkBox" id="LibraryBox">
         <property name="visible">True</property>
@@ -365,8 +111,8 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">menu.sort</property>
+                    <property name="action_target">'votes'</property>
                     <property name="text" translatable="yes">Votes</property>
-	 	    <property name="action-target">'votes'</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -380,8 +126,8 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">menu.sort</property>
+                    <property name="action_target">'name'</property>
                     <property name="text" translatable="yes">Name</property>
-		    <property name="action-target">'name'</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -395,8 +141,8 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">menu.sort</property>
+                    <property name="action_target">'language'</property>
                     <property name="text" translatable="yes">Language</property>
-		    <property name="action-target">'language'</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -410,8 +156,8 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">menu.sort</property>
+                    <property name="action_target">'country'</property>
                     <property name="text" translatable="yes">Country</property>
-		    <property name="action-target">'country'</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -425,8 +171,8 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">menu.sort</property>
+                    <property name="action_target">'state'</property>
                     <property name="text" translatable="yes">State</property>
-		    <property name="action-target">'state'</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -440,8 +186,8 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">menu.sort</property>
+                    <property name="action_target">'clicks'</property>
                     <property name="text" translatable="yes">Clicks</property>
-		    <property name="action-target">'clicks'</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -455,8 +201,8 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">menu.sort</property>
+                    <property name="action_target">'bitrate'</property>
                     <property name="text" translatable="yes">Bitrate</property>
-		    <property name="action-target">'bitrate'</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -470,8 +216,8 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">menu.sort</property>
+                    <property name="action_target">'clicktimestamp'</property>
                     <property name="text" translatable="yes">Date</property>
-		    <property name="action-target">'clicktimestamp'</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -510,8 +256,8 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">menu.sortorder</property>
+                    <property name="action_target">'ascending'</property>
                     <property name="text" translatable="yes">Ascending</property>
-		    <property name="action-target">'ascending'</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -525,8 +271,8 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="action_name">menu.sortorder</property>
+                    <property name="action_target">'descending'</property>
                     <property name="text" translatable="yes">Descending</property>
-		    <property name="action-target">'descending'</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -554,6 +300,246 @@
         <property name="position">2</property>
       </packing>
     </child>
+    <child>
+      <object class="GtkBox" id="MainBox">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="border_width">12</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkBox" id="ZoomBox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <child>
+                  <object class="GtkButton" id="ZoomOutButton">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <signal name="clicked" handler="ZoomOutButton_clicked" swapped="no"/>
+                    <child>
+                      <object class="GtkImage">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="icon_name">zoom-out-symbolic</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="ResetZoomButton">
+                    <property name="label">100%</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="ZoomInButton">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <signal name="clicked" handler="ZoomInButton_clicked" swapped="no"/>
+                    <child>
+                      <object class="GtkImage">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="icon_name">zoom-in-symbolic</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <style>
+                  <class name="linked"/>
+                </style>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSeparator">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_top">6</property>
+                <property name="margin_bottom">6</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkModelButton" id="SortMButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="text" translatable="yes">Sorting</property>
+                <property name="menu_name">sort</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkModelButton" id="HideBrokenMButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="action_name">menu.hide-broken-stations</property>
+                <property name="text" translatable="yes">Hide broken stations</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSeparator">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_top">6</property>
+                <property name="margin_bottom">6</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">4</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkModelButton" id="LibraryMButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="text" translatable="yes">Library</property>
+                <property name="menu_name">library</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">5</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkModelButton" id="CreateStationMButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="action_name">menu.create-station</property>
+                <property name="text" translatable="yes">Create new radio station</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">6</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSeparator">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_top">6</property>
+                <property name="margin_bottom">6</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">7</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkModelButton" id="OpenDatabaseMButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="action_name">app.opendatabase</property>
+                <property name="text">radio-browser.info</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">8</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSeparator">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_top">6</property>
+                <property name="margin_bottom">6</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">9</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkModelButton" id="SettingsMButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="action_name">app.preferences</property>
+                <property name="text" translatable="yes">Settings</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">10</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkModelButton" id="AboutMButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="action_name">app.about</property>
+                <property name="text" translatable="yes">About</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">11</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="submenu">main</property>
+        <property name="position">3</property>
+      </packing>
+    </child>
   </object>
   <template class="GradioMenuButton" parent="GtkMenuButton">
     <property name="visible">True</property>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ea83eab2..4621bf1a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,4 @@
 # List of source files containing translatable strings.
-data/ui/app-menu.ui
 data/ui/page/library-page.ui
 data/ui/page/collections-page.ui
 data/ui/details-box.ui
diff --git a/src/gradio-app.vala b/src/gradio-app.vala
index 0ed87c0f..fa018a3e 100644
--- a/src/gradio-app.vala
+++ b/src/gradio-app.vala
@@ -127,13 +127,6 @@ namespace Gradio {
 			action = new GLib.SimpleAction ("select-none", null);
 			action.activate.connect (() => { window.select_none (); });
 			this.add_action (action);
-
-
-			// setup appmenu
-			var builder = new Gtk.Builder.from_resource ("/de/haecker-felix/gradio/ui/app-menu.ui");
-			var app_menu = builder.get_object ("app-menu") as GLib.MenuModel;
-			message("Desktop session is: " + GLib.Environment.get_variable("DESKTOP_SESSION"));
-			if((GLib.Environment.get_variable("DESKTOP_SESSION")).contains("gnome")) set_app_menu (app_menu);
 		}
 
 		public override bool dbus_register (DBusConnection connection, string object_path) {
diff --git a/src/gradio-menubutton.vala b/src/gradio-menubutton.vala
index 65f5614a..18107908 100644
--- a/src/gradio-menubutton.vala
+++ b/src/gradio-menubutton.vala
@@ -24,8 +24,6 @@ namespace Gradio{
 		[GtkChild] public Gtk.Button ZoomInButton;
 		[GtkChild] public Gtk.Button ZoomOutButton;
 
-		[GtkChild] public Gtk.Box AppBox;
-
 		public int actual_zoom = 100;
 		private const int min_zoom = 50;
 		private const int max_zoom = 175;
@@ -42,11 +40,6 @@ namespace Gradio{
 			this.insert_action_group ("menu", action_group);
 			setup_actions();
 
-			// Show app actions on non GNOME desktops in menu popover
-			if(!(GLib.Environment.get_variable("DESKTOP_SESSION")).contains("gnome")) {
-				AppBox.set_visible(true);
-			}
-
 			App.settings.notify["station-sorting"].connect(() => {
  				var action = action_group.lookup_action ("sort") as GLib.SimpleAction;
 				action.set_state(Util.get_sort_string());