A touch sensor panel is disclosed. The touch sensor panel includes a first set of touch electrodes configured to operate as drive lines and that are disposed in a first layer of the touch sensor panel. The touch sensor panel also includes a second set of touch electrodes configured to operate as sense lines and that are disposed in a second layer of the touch sensor panel, different than the first layer of the touch sensor panel, such that one or more mutual capacitance touch nodes are formed by the first set of touch electrodes and the second set of touch electrodes. The touch sensor panel also includes a third set of touch electrodes configured to operate as self-capacitance electrodes and that are disposed in the first layer or the second layer of the touch sensor panel.