Covering #31 Remove drawable dependency from framework files