Shortbread in Berwick or central Edinburgh

[Failingatthemoment]

Friend really likes proper Scottish shortbread . We are driving to Berwick and catching the train to Edinburgh tomorrow. Does anyone have any recommendations? Thanks

Actually, I really rate M&S tins of Scottish shortbread.

Agree M&S shortie is very good. My favourite is actually Sainsbury’s own shortbread fingers, amazing!! 🤣