diff --git a/release/scripts/ui/properties_data_mesh.py b/release/scripts/ui/properties_data_mesh.py
index 48f0c39a4f3..788345340d6 100644
--- a/release/scripts/ui/properties_data_mesh.py
+++ b/release/scripts/ui/properties_data_mesh.py
@@ -180,8 +180,14 @@ class DATA_PT_shape_keys(DataButtonsPanel):
 
             subrow = sub.row(align=True)
             subrow.active = enable_edit_value
-            subrow.itemR(ob, "shape_key_lock", icon='ICON_UNPINNED', text="")
-            subrow.itemR(kb, "mute", icon='ICON_MUTE_IPO_OFF', text="")
+            if ob.shape_key_lock:
+                subrow.itemR(ob, "shape_key_lock", icon='ICON_PINNED', text="")
+            else:
+                subrow.itemR(ob, "shape_key_lock", icon='ICON_UNPINNED', text="")
+            if kb.mute:
+                subrow.itemR(kb, "mute", icon='ICON_MUTE_IPO_ON', text="")
+            else:
+                subrow.itemR(kb, "mute", icon='ICON_MUTE_IPO_OFF', text="")
             subrow.itemO("object.shape_key_clear", icon='ICON_X', text="")
 
             sub.itemO("object.shape_key_mirror", icon='ICON_MOD_MIRROR', text="")
diff --git a/release/scripts/ui/space_view3d_toolbar.py b/release/scripts/ui/space_view3d_toolbar.py
index 3c99a656524..73f613177b8 100644
--- a/release/scripts/ui/space_view3d_toolbar.py
+++ b/release/scripts/ui/space_view3d_toolbar.py
@@ -278,6 +278,7 @@ class VIEW3D_PT_tools_armatureedit(View3DPanel):
         col = layout.column(align=True)
         col.itemL(text="Modeling:")
         col.itemO("armature.extrude_move")
+        col.itemO("armature.subdivide_multi", text="Subdivide")
 
         col = layout.column(align=True)
         col.itemL(text="Grease Pencil:")
diff --git a/source/blender/editors/armature/armature_ops.c b/source/blender/editors/armature/armature_ops.c
index 790b0a39d41..cc359deca07 100644
--- a/source/blender/editors/armature/armature_ops.c
+++ b/source/blender/editors/armature/armature_ops.c
@@ -209,7 +209,7 @@ void ED_keymap_armature(wmKeyConfig *keyconf)
 	
 	WM_keymap_add_item(keymap, "ARMATURE_OT_bone_primitive_add", AKEY, KM_PRESS, KM_SHIFT, 0);
 		/* only the menu-version of subdivide is registered in keymaps for now */
-	WM_keymap_add_item(keymap, "ARMATURE_OT_subdivs", SKEY, KM_PRESS, KM_ALT, 0);
+	WM_keymap_add_item(keymap, "ARMATURE_OT_subdivide_multi", WKEY, KM_PRESS, 0, 0);
 	
 	WM_keymap_add_item(keymap, "ARMATURE_OT_parent_set", PKEY, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "ARMATURE_OT_parent_clear", PKEY, KM_PRESS, KM_ALT, 0);