Rework certificate deletion dialog
(cherry picked from commit 377fcec9c3129be796cb37a0e64a2475c382324c)