diff --git a/rigify/legacy/ui.py b/rigify/legacy/ui.py
index 2671108b756cdeecfb285c304db7085afe5ebdeb..f04ec335d6a52b90c0ff8832e96555c81a194b9b 100644
--- a/rigify/legacy/ui.py
+++ b/rigify/legacy/ui.py
@@ -200,9 +200,9 @@ class BONE_PT_rigify_buttons(bpy.types.Panel):
 
 class VIEW3D_PT_tools_rigify_dev(bpy.types.Panel):
     bl_label = "Rigify Dev Tools"
-    bl_category = 'Tools'
     bl_space_type = 'VIEW_3D'
-    bl_region_type = 'TOOLS'
+    bl_region_type = 'UI'
+    bl_category = 'View'
 
     @classmethod
     def poll(cls, context):
diff --git a/rigify/rot_mode.py b/rigify/rot_mode.py
index 8129040bd7905a0f25755e8b80b6cb19b37716e8..9abfecea3a41b94401443cc03be7160d4636e46d 100644
--- a/rigify/rot_mode.py
+++ b/rigify/rot_mode.py
@@ -223,8 +223,8 @@ convert = convert()
 
 class ToolsPanel(bpy.types.Panel):
     bl_space_type = 'VIEW_3D'
-    bl_region_type = 'TOOLS'
-    bl_category = "Tools"
+    bl_region_type = 'UI'
+    bl_category = 'View'
     bl_context = "posemode"
     bl_label = 'Rigify Quat/Euler Converter'
 
diff --git a/rigify/ui.py b/rigify/ui.py
index 2effb58fc116cc2440400a2ccc75407e1f91d560..77398ff03a1badbd67485910cfbcc013f56a3799 100644
--- a/rigify/ui.py
+++ b/rigify/ui.py
@@ -633,9 +633,9 @@ class BONE_PT_rigify_buttons(bpy.types.Panel):
 
 class VIEW3D_PT_tools_rigify_dev(bpy.types.Panel):
     bl_label = "Rigify Dev Tools"
-    bl_category = 'Tools'
     bl_space_type = 'VIEW_3D'
-    bl_region_type = 'TOOLS'
+    bl_region_type = 'UI'
+    bl_category = 'View'
 
     @classmethod
     def poll(cls, context):
@@ -657,10 +657,10 @@ class VIEW3D_PT_tools_rigify_dev(bpy.types.Panel):
 
 class VIEW3D_PT_rigify_animation_tools(bpy.types.Panel):
     bl_label = "Rigify Animation Tools"
-    bl_category = 'Tools'
     bl_context = "posemode"
     bl_space_type = 'VIEW_3D'
-    bl_region_type = 'TOOLS'
+    bl_region_type = 'UI'
+    bl_category = 'View'
 
     @classmethod
     def poll(cls, context):