2 files changed, 4 insertions, 11 deletions

diff --git a/js/components/layout/tool-button.reel/tool-button.html b/js/components/layout/tool-button.reel/tool-button.html
index 84a6d34e..a329f646 100755
--- a/js/components/layout/tool-button.reel/tool-button.html
+++ b/js/components/layout/tool-button.reel/tool-button.html
@@ -16,6 +16,10 @@
                 "prototype": "js/components/layout/tool-button.reel",
                 "properties": {
                     "element": {"#": "toolBarButton"}
+                },
+                "bindings": {
+                    "selected": {"<<->": "@owner.data.selected"},
+                    "subselected": {"<-": "@owner.data.subtools.selected"}
                 }
             }
         }
diff --git a/js/components/layout/tool-button.reel/tool-button.js b/js/components/layout/tool-button.reel/tool-button.js
index 6cea0dc3..6008c4ec 100755
--- a/js/components/layout/tool-button.reel/tool-button.js
+++ b/js/components/layout/tool-button.reel/tool-button.js
@@ -48,19 +48,8 @@ exports.ToolButton = Montage.create(Component, {
             this.element.addEventListener("mousedown", this, false);
             this.element.addEventListener("dblclick", this, false);
 
-            Object.defineBinding(this, "selected", {
-              boundObject: this.data,
-              boundObjectPropertyPath: "selected",
-              oneway: false
-            });
-
             if(this.data.container) {
                 this.element.title = this.data.subtools[this._subselected].toolTip;
-                Object.defineBinding(this, "subselected", {
-                    boundObject: this.data.subtools,
-                    boundObjectPropertyPath: "selected",
-                    oneway: true
-                });
             }
 
             this.element.classList.add(this.data.id)