diff --git a/src/Octave.cpp b/src/Octave.cpp
index 91831ac..770a6f7 100644
--- a/src/Octave.cpp
+++ b/src/Octave.cpp
@@ -55,7 +55,10 @@ struct Octave : Module {
 struct OctaveButton : Widget {
 	int octave;
 
-	void draw(const DrawArgs& args) override {
+	void drawLayer(const DrawArgs& args, int layer) override {
+		if (layer != 1)
+			return;
+
 		Vec c = box.size.div(2);
 
 		int activeOctave = 0;
@@ -65,9 +68,6 @@ struct OctaveButton : Widget {
 		if (pq)
 			activeOctave = std::round(pq->getValue());
 
-		// Disable tinting when rack brightness is decreased
-		nvgGlobalTint(args.vg, color::WHITE);
-
 		if (activeOctave == octave) {
 			// Enabled
 			nvgBeginPath(args.vg);
diff --git a/src/Quantizer.cpp b/src/Quantizer.cpp
index 9aa0386..498cb37 100644
--- a/src/Quantizer.cpp
+++ b/src/Quantizer.cpp
@@ -124,13 +124,13 @@ struct QuantizerButton : OpaqueWidget {
 	int note;
 	Quantizer* module;
 
-	void draw(const DrawArgs& args) override {
+	void drawLayer(const DrawArgs& args, int layer) override {
+		if (layer != 1)
+			return;
+
 		const float margin = mm2px(1.5);
 		Rect r = box.zeroPos().grow(Vec(margin, margin / 2).neg());
 
-		// Disable tinting when rack brightness is decreased
-		nvgGlobalTint(args.vg, color::WHITE);
-
 		nvgBeginPath(args.vg);
 		nvgRect(args.vg, RECT_ARGS(r));
 		if (module ? module->playingNotes[note] : (note == 0)) {
diff --git a/src/Scope.cpp b/src/Scope.cpp
index e5df0f7..8366085 100644
--- a/src/Scope.cpp
+++ b/src/Scope.cpp
@@ -297,12 +297,12 @@ struct ScopeDisplay : TransparentWidget {
 		nvgText(args.vg, pos.x + 58 * 2, pos.y, text.c_str(), NULL);
 	}
 
-	void draw(const DrawArgs& args) override {
-		if (!module)
+	void drawLayer(const DrawArgs& args, int layer) override {
+		if (layer != 1)
 			return;
 
-		// Disable tinting when rack brightness is decreased
-		nvgGlobalTint(args.vg, color::WHITE);
+		if (!module)
+			return;
 
 		float gainX = std::pow(2.f, std::round(module->params[Scope::X_SCALE_PARAM].getValue())) / 10.f;
 		float gainY = std::pow(2.f, std::round(module->params[Scope::Y_SCALE_PARAM].getValue())) / 10.f;
diff --git a/src/VCA.cpp b/src/VCA.cpp
index ba6b4a9..3ac73da 100644
--- a/src/VCA.cpp
+++ b/src/VCA.cpp
@@ -210,9 +210,11 @@ struct VCA_1VUKnob : SliderKnob {
 		nvgRoundedRect(args.vg, 0, 0, box.size.x, box.size.y, 2.0);
 		nvgFillColor(args.vg, nvgRGB(0, 0, 0));
 		nvgFill(args.vg);
+	}
 
-		// Disable tinting when rack brightness is decreased
-		nvgGlobalTint(args.vg, color::WHITE);
+	void drawLayer(const DrawArgs& args, int layer) override {
+		if (layer != 1)
+			return;
 
 		const Vec margin = Vec(3, 3);
 		Rect r = box.zeroPos().grow(margin.neg());