diff --git a/admin.php b/admin.php
index 9b0d86879..809eecc78 100644
--- a/admin.php
+++ b/admin.php
@@ -181,6 +181,7 @@ $template->assign(
     'U_CONFIG_LANGUAGES' => $link_start.'languages',
     'U_CONFIG_THEMES'=> $link_start.'themes',
     'U_CATEGORIES'=> $link_start.'cat_list',
+    'U_CAT_MOVE'=> $link_start.'cat_move',
     'U_CAT_OPTIONS'=> $link_start.'cat_options',
     'U_CAT_UPDATE'=> $link_start.'site_update&site=1',
     'U_RATING'=> $link_start.'rating',
diff --git a/admin/cat_move.php b/admin/cat_move.php
index 3e134db3a..4a81fe430 100644
--- a/admin/cat_move.php
+++ b/admin/cat_move.php
@@ -119,13 +119,6 @@ $template->assign(
     'F_ACTION' => get_root_url().'admin.php?page=cat_move',
     )
   );
-  
-// +-----------------------------------------------------------------------+
-// | tabs                                                                  |
-// +-----------------------------------------------------------------------+
-
-$page['tab'] = 'move';
-include(PHPWG_ROOT_PATH.'admin/include/albums_tab.inc.php');
 
 // +-----------------------------------------------------------------------+
 // |                          Album display                                |
diff --git a/admin/include/add_core_tabs.inc.php b/admin/include/add_core_tabs.inc.php
index 924780b37..e4a686056 100644
--- a/admin/include/add_core_tabs.inc.php
+++ b/admin/include/add_core_tabs.inc.php
@@ -32,7 +32,6 @@ function add_core_tabs($sheets, $tab_id)
     case 'albums':
       global $my_base_url;
       $sheets['list'] = array('caption' => '<span class="icon-menu"></span>'.l10n('List'), 'url' => $my_base_url.'cat_list');
-      $sheets['move'] = array('caption' => '<span class="icon-move"></span>'.l10n('Move'), 'url' => $my_base_url.'cat_move');
       $sheets['permalinks'] = array('caption' => '<span class="icon-link-1"></span>'.l10n('Permalinks'), 'url' => $my_base_url.'permalinks');
       break;
 
diff --git a/admin/themes/default/template/admin.tpl b/admin/themes/default/template/admin.tpl
index 9ae6973ed..efbcff6e9 100644
--- a/admin/themes/default/template/admin.tpl
+++ b/admin/themes/default/template/admin.tpl
@@ -71,6 +71,7 @@ jQuery(document).ready(function() {
     <dd>
       <ul>
         <li><a href="{$U_CATEGORIES}"><i class="icon-folder-open"></i>{'Manage'|@translate}</a></li>
+        <li><a href="{$U_CAT_MOVE}"><i class="icon-move"></i>{'Move'|@translate}</a></li>
         <li><a href="{$U_CAT_OPTIONS}"><i class="icon-pencil"></i>{'Properties'|@translate}</a></li>
       </ul>
     </dd>
diff --git a/admin/themes/default/template/cat_move.tpl b/admin/themes/default/template/cat_move.tpl
index c23c98b96..1e83e265d 100644
--- a/admin/themes/default/template/cat_move.tpl
+++ b/admin/themes/default/template/cat_move.tpl
@@ -36,40 +36,40 @@ var openCat = {$open_cat};
     <form action="{$F_ACTION}" method="post">
       <input type="hidden" name="id" value="-1">
       <div class="choice-container">
-        <label>
-          {'Album name, A &rarr; Z'|@translate}
+        <label class="font-checkbox">
+          <span class="icon-dot-circled"> </span>
           <input type="radio" value="name ASC" name="order" checked>
-          <span class="order-checkmark"> 
+          {'Album name, A &rarr; Z'|@translate}
         </label>
 
-        <label>
-          {'Album name, Z &rarr; A'|@translate}
+        <label class="font-checkbox">
+          <span class="icon-dot-circled"> </span>
           <input type="radio" value="name DESC" name="order">
-          <span class="order-checkmark"> 
+          {'Album name, Z &rarr; A'|@translate}
         </label>
 
-        <label>
-          {'Date created, new &rarr; old'|@translate}
+        <label class="font-checkbox">
+          <span class="icon-dot-circled"> </span>
           <input type="radio" value="date_creation DESC" name="order">
-          <span class="order-checkmark"> 
+          {'Date created, new &rarr; old'|@translate}
         </label>
 
-        <label>
-          {'Date created, old &rarr; new'|@translate}
+        <label class="font-checkbox">
+          <span class="icon-dot-circled"> </span>
           <input type="radio" value="date_creation ASC" name="order">
-          <span class="order-checkmark"> 
+          {'Date created, old &rarr; new'|@translate}
         </label>
 
-        <label>
-          {'Date posted, new &rarr; old'|@translate}
+        <label class="font-checkbox">
+          <span class="icon-dot-circled"> </span>
           <input type="radio" value="date_available DESC" name="order">
-          <span class="order-checkmark"> 
+          {'Date posted, new &rarr; old'|@translate}
         </label>
 
-        <label>
-          {'Date posted, old &rarr; new'|@translate}
+        <label class="font-checkbox">
+          <span class="icon-dot-circled"> </span>
           <input type="radio" value="date_available ASC" name="order">
-          <span class="order-checkmark"> 
+          {'Date posted, old &rarr; new'|@translate}
         </label>
       </div>
       <input type="submit" name="simpleAutoOrder" value="{'Apply to direct sub-albums'|@translate}"/>
diff --git a/admin/themes/default/template/intro.tpl b/admin/themes/default/template/intro.tpl
index 2c53a6b5b..6cad79619 100644
--- a/admin/themes/default/template/intro.tpl
+++ b/admin/themes/default/template/intro.tpl
@@ -194,6 +194,7 @@ $(window).on('resize', function(){
                   {elseif $action == "Delete"} <span class="icon-trash tooltip-detail" title="{"%s deletions"|@translate:$number}">{$number}</span>
                   {elseif $action == "Login"} <span class="icon-key tooltip-detail" title="{"%s login"|@translate:$number}">{$number}</span>
                   {elseif $action == "Logout"} <span class="icon-logout tooltip-detail" title="{"%s logout"|@translate:$number}">{$number} </span>
+                  {elseif $action == "Move"} <span class="icon-move tooltip-detail" title="{"%s movement"|@translate:$number}">{$number} </span>
                   {else} <span> ({$action|@translate}) {$number} </span> 
                   {/if}  
                 {/foreach}
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css
index 5bfe3f12a..8c673e1a6 100644
--- a/admin/themes/default/theme.css
+++ b/admin/themes/default/theme.css
@@ -2887,7 +2887,7 @@ FORM#categoryOrdering p.albumActions .userSeparator {margin:0 5px;}
   background-color: #f3f3f3;
   border-radius: 10px;
   display: block;
-  width: 30%;
+  width: 25%;
   position: absolute;
   left: 50%;
   top: 50%;
@@ -2910,40 +2910,6 @@ FORM#categoryOrdering p.albumActions .userSeparator {margin:0 5px;}
 .cat-move-order-popin label {
   position: relative;
   padding: 5px;
-  padding-left: 25px;
-}
-
-.cat-move-order-popin .order-checkmark {
-  width:16px;
-  height: 16px;
-  border-radius: 100%;
-  background-color: #d5d5d5;
-  position: absolute;
-  top: 50%;
-  left: 0px;
-  transform: translate(0, -50%);
-  transition: ease 0.3s;
-}
-
-.cat-move-order-popin .order-checkmark::before {
-  content: "";
-  padding: 0px;
-  background-color: #ffa646;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  border-radius: 100%; 
-  transition: ease 0.3s;
-  opacity: 0.15;
-}
-
-.cat-move-order-popin input:checked + .order-checkmark::before {
-  padding: 15px;
-}
-
-.cat-move-order-popin input:checked + .order-checkmark {
-  background-color: #ffa646;
 }
 
 .cat-move-order-popin input[type=radio] {
diff --git a/admin/themes/roma/theme.css b/admin/themes/roma/theme.css
index e683865b2..b10076371 100644
--- a/admin/themes/roma/theme.css
+++ b/admin/themes/roma/theme.css
@@ -1035,6 +1035,15 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important;
   box-shadow: none;
 }
 
+.cat-move-order-popin .order-popin-container {
+  background-color: #444;
+  color: white;
+}
+
+.cat-move-order-popin .album-name {
+  color: white;
+}
+
 /* Icon colors*/
 
 .icon-red {