diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index 371ad94ddc8af518a07366704dc231caa0b795d7..27dacfb2c5e08f6e6ceed1c836d95f245de37034 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -132,7 +132,8 @@ var dw_mediamanager = {
         });
 
         // Init buttonset
-        $both.buttonset();
+        $both.find("input[type='radio']").checkboxradio({icon: false});
+        $both.controlgroup();
 
         // Change handlers
         $listType.children('input').change(function () {
diff --git a/lib/tpl/dokuwiki/css/_media_fullscreen.css b/lib/tpl/dokuwiki/css/_media_fullscreen.css
index b1bbc9d770a5d04bc58e365ad50dfcd9a3e3817f..9a00d4d07d630f5ff9dde179be38c119834d3f60 100644
--- a/lib/tpl/dokuwiki/css/_media_fullscreen.css
+++ b/lib/tpl/dokuwiki/css/_media_fullscreen.css
@@ -203,7 +203,7 @@
     float: right;
 }
 
-#mediamanager__page .panelHeader ul li.ui-buttonset {
+#mediamanager__page .panelHeader ul li.ui-controlgroup-horizontal {
     padding-left: 30px;
     margin: 0 0 0 5px;
 }
@@ -213,18 +213,16 @@
 #mediamanager__page .panelHeader ul li.sortBy {
     background: url('../../images/icon-sort.png') 3px 1px no-repeat;
 }
-[dir=rtl] #mediamanager__page .panelHeader ul li.ui-buttonset {
+[dir=rtl] #mediamanager__page .panelHeader ul li.ui-controlgroup-horizontal {
     padding-left: 0;
     padding-right: 30px;
     margin: 0 5px 0 0;
     background-position: right 1px;
 }
 
-#mediamanager__page .panelHeader form.options .ui-buttonset label{
+#mediamanager__page .panelHeader form.options .ui-controlgroup-horizontal label{
     font-size: 90%;
     margin-right: -0.4em;
-}
-#mediamanager__page .panelHeader form.options .ui-buttonset .ui-button-text {
     padding: .3em .5em;
     line-height: 1;
 }