diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 31d65972af..8440022844 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -225,6 +225,7 @@
   <texture name="Object_Cylinder" file_name="build/Object_Cylinder.png" preload="false" />
   <texture name="Object_Grass" file_name="build/Object_Grass.png" preload="false" />
   <texture name="Object_Hemi_Cone" file_name="build/Object_Hemi_Cone.png" preload="false" />
+  <texture name="Object_Hemi_Cylinder" file_name="build/Object_Hemi_Cylinder.png" preload="false" />
   <texture name="Object_Hemi_Sphere" file_name="build/Object_Hemi_Sphere.png" preload="false" />
   <texture name="Object_Prism" file_name="build/Object_Prism.png" preload="false" />
   <texture name="Object_Pyramid" file_name="build/Object_Pyramid.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 46679c19d2..edbd28cd2d 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -64,69 +64,69 @@
     </floater.string>
     <button
      follows="left|top"
-     height="32"
-     image_disabled="tool_zoom.tga"
+     height="20"
+     image_disabled="Tool_Zoom"
      image_disabled_selected="tool_zoom_active.tga"
      image_selected="tool_zoom_active.tga"
-     image_unselected="tool_zoom.tga"
+     image_unselected="Tool_Zoom"
      layout="topleft"
      left="10"
      name="button focus"
      picture_style="true"
      tool_tip="Focus"
-     width="32" />
+     width="20" />
     <button
      follows="left|top"
-     height="32"
-     image_disabled="tool_grab.tga"
+     height="20"
+     image_disabled="Tool_Grab"
      image_disabled_selected="tool_grab_active.tga"
      image_selected="tool_grab_active.tga"
-     image_unselected="tool_grab.tga"
+     image_unselected="Tool_Grab"
      layout="topleft"
      left_pad="8"
      name="button move"
      picture_style="true"
      tool_tip="Move"
-     width="32" />
+     width="20" />
     <button
      follows="left|top"
-     height="32"
-     image_disabled="tool_face.tga"
+     height="20"
+     image_disabled="Tool_Face"
      image_disabled_selected="tool_face_active.tga"
      image_selected="tool_face_active.tga"
-     image_unselected="tool_face.tga"
+     image_unselected="Tool_Face"
      layout="topleft"
      left_pad="8"
      name="button edit"
      picture_style="true"
      tool_tip="Edit"
-     width="32" />
+     width="20" />
     <button
      follows="left|top"
-     height="32"
-     image_disabled="tool_create.tga"
+     height="20"
+     image_disabled="Tool_Create"
      image_disabled_selected="tool_create_active.tga"
      image_selected="tool_create_active.tga"
-     image_unselected="tool_create.tga"
+     image_unselected="Tool_Create"
      layout="topleft"
      left_pad="8"
      name="button create"
      picture_style="true"
      tool_tip="Create"
-     width="32" />
+     width="20" />
     <button
      follows="left|top"
-     height="32"
-     image_disabled="tool_dozer.tga"
+     height="20"
+     image_disabled="Tool_Dozer"
      image_disabled_selected="tool_dozer_active.tga"
      image_selected="tool_dozer_active.tga"
-     image_unselected="tool_dozer.tga"
+     image_unselected="Tool_Dozer"
      layout="topleft"
      left_pad="8"
      name="button land"
      picture_style="true"
      tool_tip="Land"
-     width="32" />
+     width="20" />
     <text
      type="string"
      text_color="LabelSelectedDisabledColor"
@@ -289,214 +289,214 @@
      height="22" />
     <button
      follows="left|top"
-     height="24"
-     image_disabled="object_cube.tga"
+     height="20"
+     image_disabled="Object_Cube"
      image_disabled_selected="object_cube_active.tga"
      image_selected="object_cube_active.tga"
-     image_unselected="object_cube.tga"
+     image_unselected="Object_Cube"
      layout="topleft"
      left="4"
      name="ToolCube"
      picture_style="true"
      tool_tip="Cube"
      top="51"
-     width="24" />
+     width="20" />
     <button
      follows="left|top"
-     height="24"
-     image_disabled="object_prism.tga"
+     height="20"
+     image_disabled="Object_Prism"
      image_disabled_selected="object_prism_active.tga"
      image_selected="object_prism_active.tga"
-     image_unselected="object_prism.tga"
+     image_unselected="Object_Prism"
      layout="topleft"
-     left_delta="23"
+     left_delta="26"
      name="ToolPrism"
      picture_style="true"
      tool_tip="Prism"
      top_delta="0"
-     width="24" />
+     width="20" />
     <button
      follows="left|top"
-     height="24"
-     image_disabled="object_pyramid.tga"
+     height="20"
+     image_disabled="Object_Pyramid"
      image_disabled_selected="object_pyramid_active.tga"
      image_selected="object_pyramid_active.tga"
-     image_unselected="object_pyramid.tga"
+     image_unselected="Object_Pyramid"
      layout="topleft"
-     left_delta="23"
+     left_delta="26"
      name="ToolPyramid"
      picture_style="true"
      tool_tip="Pyramid"
      top_delta="0"
-     width="24" />
+     width="20" />
     <button
      follows="left|top"
-     height="24"
-     image_disabled="object_tetrahedron.tga"
+     height="20"
+     image_disabled="Object_Tetrahedron"
      image_disabled_selected="object_tetrahedron_active.tga"
      image_selected="object_tetrahedron_active.tga"
-     image_unselected="object_tetrahedron.tga"
+     image_unselected="Object_Tetrahedron"
      layout="topleft"
-     left_delta="23"
+     left_delta="26"
      name="ToolTetrahedron"
      picture_style="true"
      tool_tip="Tetrahedron"
      top_delta="0"
-     width="24" />
+     width="20" />
     <button
      follows="left|top"
-     height="24"
-     image_disabled="object_cylinder.tga"
+     height="20"
+     image_disabled="Object_Cylinder"
      image_disabled_selected="object_cylinder_active.tga"
      image_selected="object_cylinder_active.tga"
-     image_unselected="object_cylinder.tga"
+     image_unselected="Object_Cylinder"
      layout="topleft"
-     left_delta="23"
+     left_delta="26"
      name="ToolCylinder"
      picture_style="true"
      tool_tip="Cylinder"
      top_delta="0"
-     width="24" />
+     width="20" />
     <button
      follows="left|top"
-     height="24"
-     image_disabled="object_hemi_cylinder.tga"
+     height="20"
+     image_disabled="Object_Hemi_Cylinder"
      image_disabled_selected="object_hemi_cylinder_active.tga"
      image_selected="object_hemi_cylinder_active.tga"
-     image_unselected="object_hemi_cylinder.tga"
+     image_unselected="Object_Hemi_Cylinder"
      layout="topleft"
-     left_delta="23"
+     left_delta="26"
      name="ToolHemiCylinder"
      picture_style="true"
      tool_tip="Hemicylinder"
      top_delta="0"
-     width="24" />
+     width="20" />
     <button
      follows="left|top"
-     height="24"
-     image_disabled="object_cone.tga"
+     height="20"
+     image_disabled="Object_Cone"
      image_disabled_selected="object_cone_active.tga"
      image_selected="object_cone_active.tga"
-     image_unselected="object_cone.tga"
+     image_unselected="Object_Cone"
      layout="topleft"
-     left_delta="23"
+     left_delta="26"
      name="ToolCone"
      picture_style="true"
      tool_tip="Cone"
      top_delta="0"
-     width="24" />
+     width="20" />
     <button
      follows="left|top"
-     height="24"
-     image_disabled="object_hemi_cone.tga"
+     height="20"
+     image_disabled="Object_Hemi_Cone"
      image_disabled_selected="object_hemi_cone_active.tga"
      image_selected="object_hemi_cone_active.tga"
-     image_unselected="object_hemi_cone.tga"
+     image_unselected="Object_Hemi_Cone"
      layout="topleft"
-     left_delta="23"
+     left_delta="26"
      name="ToolHemiCone"
      picture_style="true"
      tool_tip="Hemicone"
      top_delta="0"
-     width="24" />
+     width="20" />
     <button
      follows="left|top"
-     height="24"
-     image_disabled="object_sphere.tga"
+     height="20"
+     image_disabled="Object_Sphere"
      image_disabled_selected="object_sphere_active.tga"
      image_selected="object_sphere_active.tga"
-     image_unselected="object_sphere.tga"
+     image_unselected="Object_Sphere"
      layout="topleft"
-     left_delta="23"
+     left_delta="26"
      name="ToolSphere"
      picture_style="true"
      tool_tip="Sphere"
      top_delta="0"
-     width="24" />
+     width="20" />
     <button
      follows="left|top"
-     height="24"
-     image_disabled="object_hemi_sphere.tga"
+     height="20"
+     image_disabled="Object_Hemi_Sphere"
      image_disabled_selected="object_hemi_sphere_active.tga"
      image_selected="object_hemi_sphere_active.tga"
-     image_unselected="object_hemi_sphere.tga"
+     image_unselected="Object_Hemi_Sphere"
      layout="topleft"
-     left_delta="23"
+     left_delta="26"
      name="ToolHemiSphere"
      picture_style="true"
      tool_tip="Hemisphere"
      top_delta="0"
-     width="24" />
+     width="20" />
     <button
      follows="left|top"
-     height="24"
-     image_disabled="object_torus.tga"
+     height="20"
+     image_disabled="Object_Torus"
      image_disabled_selected="object_torus_active.tga"
      image_selected="object_torus_active.tga"
-     image_unselected="object_torus.tga"
+     image_unselected="Object_Torus"
      layout="topleft"
      left="4"
      name="ToolTorus"
      picture_style="true"
      tool_tip="Torus"
-     top="74"
-     width="24" />
+     top="77"
+     width="20" />
     <button
      follows="left|top"
-     height="24"
-     image_disabled="object_tube.tga"
+     height="20"
+     image_disabled="Object_Tube"
      image_disabled_selected="object_tube_active.tga"
      image_selected="object_tube_active.tga"
-     image_unselected="object_tube.tga"
+     image_unselected="Object_Tube"
      layout="topleft"
-     left_delta="23"
+     left_delta="26"
      name="ToolTube"
      picture_style="true"
      tool_tip="Tube"
      top_delta="0"
-     width="24" />
+     width="20" />
     <button
      follows="left|top"
-     height="24"
-     image_disabled="object_ring.tga"
+     height="20"
+     image_disabled="Object_Ring"
      image_disabled_selected="object_ring_active.tga"
      image_selected="object_ring_active.tga"
-     image_unselected="object_ring.tga"
+     image_unselected="Object_Ring"
      layout="topleft"
-     left_delta="23"
+     left_delta="26"
      name="ToolRing"
      picture_style="true"
      tool_tip="Ring"
      top_delta="0"
-     width="24" />
+     width="20" />
     <button
      follows="left|top"
-     height="24"
-     image_disabled="object_tree.tga"
+     height="20"
+     image_disabled="Object_Tree"
      image_disabled_selected="object_tree_active.tga"
      image_selected="object_tree_active.tga"
-     image_unselected="object_tree.tga"
+     image_unselected="Object_Tree"
      layout="topleft"
-     left_delta="23"
+     left_delta="26"
      name="ToolTree"
      picture_style="true"
      tool_tip="Tree"
      top_delta="0"
-     width="24" />
+     width="20" />
     <button
      follows="left|top"
-     height="24"
-     image_disabled="object_grass.tga"
+     height="20"
+     image_disabled="Object_Grass"
      image_disabled_selected="object_grass_active.tga"
      image_selected="object_grass_active.tga"
-     image_unselected="object_grass.tga"
+     image_unselected="Object_Grass"
      layout="topleft"
-     left_delta="23"
+     left_delta="26"
      name="ToolGrass"
      picture_style="true"
      tool_tip="Grass"
      top_delta="0"
-     width="24" />
+     width="20" />
     <check_box
      control_name="CreateToolKeepSelected"
      height="19"