5 files changed, 33 insertions, 9 deletions
diff --git a/css/ninja.css b/css/ninja.css
index 6b3c00d6..33ec332c 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -823,6 +823,12 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
 .distRightIcon { background-image: url("../images/optionsbar/selection/DistRight.png"); }
+.optionsPenTool input.penToolIcon { background-image: url("../images/tools/Tool-Pen.png"); }
+.optionsPenTool input.penPlusToolIcon { background-image: url("../images/optionsbar/pen/penPlus.png"); }
+.optionsPenTool input.penMinusToolIcon { background-image: url("../images/optionsbar/pen/penMinus.png"); }
 #toolsPanelContent { width: 40px; }
 .toolsList { width: 29px; margin: auto; }
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.css b/js/components/tools-properties/pen-properties.reel/pen-properties.css
index c6e68195..7f1b0f7f 100755
--- a/js/components/tools-properties/pen-properties.reel/pen-properties.css
+++ b/js/components/tools-properties/pen-properties.reel/pen-properties.css
@@ -4,9 +4,3 @@
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
- .optionsPenTool {
-}
- .optionsPenTool > * {
-    float:left;
-}
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.html b/js/components/tools-properties/pen-properties.reel/pen-properties.html
index 324d1070..e720eb84 100755
--- a/js/components/tools-properties/pen-properties.reel/pen-properties.html
+++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html
@@ -28,18 +28,28 @@
                "prototype": "js/components/tools-properties/pen-properties.reel",
                "properties": {
                    "element": {"#": "penProperties"},
+                    "_penToolRadio": {"#": "penTool"},
+                    "_penPlusRadio": {"#": "penPlus"},
+                    "_penMinusRadio": {"#": "penMinus"},
                    "_fillColorCtrl": {"#": "fillColorCtrl"},
                    "_strokeColorCtrl": {"#": "strokeColorCtrl"},
                    "_strokeSize": {"@": "strokeSizeHT"}
                }
            }
        }
-            </script>
+        </script>
       
    </head>
    <body>
-    <div data-montage-id="penProperties" class="subToolHolderPanel optionsPenTool">
+    <div data-montage-id="penProperties" class="subToolHolderPanel toolOptionsFloatChildren optionsPenTool">
+        <input type="radio" data-montage-id="penTool" class="toolOptsRadioButton penToolIcon" title="Pen Tool" name="penSubtoolRadios" value="pen" checked/>
+        <input type="radio" data-montage-id="penPlus" class="toolOptsRadioButton penPlusToolIcon" title="Pen Plus" name="penSubtoolRadios" value="penPlus"/>
+        <input type="radio" data-montage-id="penMinus" class="toolOptsRadioButton penMinusToolIcon toolOptionsSpacer" title="Pen Minus" name="penSubtoolRadios" value="penMinus"/>
+        <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
        <div class="toolColorChipIcon PencilTool"></div>
        <div data-montage-id="strokeColorCtrl" class="toolColorChipCtrl"></div>
        <div class="toolColorChipIcon FillTool"></div>
diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.html b/js/components/tools-properties/tag-properties.reel/tag-properties.html
index 7a8f6d87..87f87aff 100755
--- a/js/components/tools-properties/tag-properties.reel/tag-properties.html
+++ b/js/components/tools-properties/tag-properties.reel/tag-properties.html
@@ -45,7 +45,7 @@
                <input type="radio" data-montage-id="canvasTool" class="toolOptsRadioButton canvasTool" title="Canvas Element" name="TagRadios" value="canvas"/>
                <input type="radio" data-montage-id="customTool" class="toolOptsRadioButton customTool" title="Custom Element" name="TagRadios" value="custom"/>
-                <div class="nj-divider divider-vertical">&nbsp;</div>
+                <div class="nj-divider divider-vertical toolOptionsSpacer">&nbsp;</div>
                <div class="toolColorChipIcon FillTool"></div>
                <div data-montage-id="fillColorCtrl" class="toolColorChipCtrl"></div>
diff --git a/scss/imports/scss/_Tools.scss b/scss/imports/scss/_Tools.scss
index a4deb488..d068fd2e 100755
--- a/scss/imports/scss/_Tools.scss
+++ b/scss/imports/scss/_Tools.scss
@@ -458,3 +458,17 @@ input[type="radio"]:disabled {
        background-image: url("../images/optionsbar/selection/DistRight.png");  
 }
+.optionsPenTool {
+}
+.optionsPenTool input.penToolIcon {
+    background-image:url("../images/tools/Tool-Pen.png");
+}
+.optionsPenTool input.penPlusToolIcon {
+    background-image:url("../images/optionsbar/pen/penPlus.png");
+}
+.optionsPenTool input.penMinusToolIcon {
+    background-image:url("../images/optionsbar/pen/penMinus.png");
+}