UI issues with Edit/Trash buttons

(Incomplete Feature, To be Fixed , Priority: Medium, Test Status: No automated tests yet , Reported By Bad Link: Thing 3y284of not found, )
Summary: Current editor UI tends to encourage accidental deletion of Properties.
When creating a new Thing, if you want to put data into a Property, you first have to click the little "Edit" button (with a pen) next to that Property. Thus, it is easy to get into the habit of always clicking on that button prior to editing a field.
However, if a given Property already exists on the Thing, such as (for most Models) Display Name, the "Edit" button is replaced by a "Trash" button. The Trash button is in the same relative location as the Edit button, and of the same size and shape, just featuring a different interior icon. So, in such cases, your habit will frequently accidentally remove the Property entirely!

Alexx: That Trash button is pretty useful when first noodling around and trying to figure out what structure a new Space ought to have. Once that structure settles down a bit, though, it starts to look a lot less useful, and a lot more like a land mine. Maybe that functionality should be put somewhere harder to access? Or only easily accessible when the user is in some sort of explicit "Space Restructuring Mode"?
For that matter, having to explicitly click on "Edit" doesn't seem all that useful from a user standpoint. It's adding up to a lot of clicks. I understand that there is value in distinguishing between null/inherited values and ones that have been explicitly edited on this instance.
Maybe instead of clicking to Edit, there should be a button click to Revert to Default (sort of similar to the current Trash, but not actually removing the Property from the display). Such a button could be grayed out when the Property in question hasn't yet been edited. It also could live off to the right, maybe, out of the way of primary attention/workflow...

Justin: yeah, in general I'm not happy about this button. Instead of addressing this bug directly, I sort of think of it as part of the larger "rewrite the Editor" project, which is going to be ongoing for a while.
I suspect that this problem will be helped quite a lot by the removal of the "Edit" button (which I've decided is just irritating); the new design (still in the hand-wave stage, though, so we'll see how it comes out) is that all Property values will be enabled to begin with, and there will be some sort of highlight that indicates whether the current value is inherited. If you change the value, that automatically makes it non-inherited. So this should eliminate the habit of pressing that button regularly.
That said, I agree that moving the Trash / Revert button to the right, or putting it behind a second click, is likely a good idea. Especially once the above change is made, we'll want to rethink the layout and workflow...