diff --git a/assets/clear.png b/assets/clear.png
new file mode 100644
index 00000000..dd5901da
Binary files /dev/null and b/assets/clear.png differ
diff --git a/assets/confirm.png b/assets/confirm.png
new file mode 100644
index 00000000..4dadd5ff
Binary files /dev/null and b/assets/confirm.png differ
diff --git a/assets/lock.png b/assets/lock.png
new file mode 100644
index 00000000..4c5dadea
Binary files /dev/null and b/assets/lock.png differ
diff --git a/assets/send.png b/assets/send.png
new file mode 100644
index 00000000..9dd8b49a
Binary files /dev/null and b/assets/send.png differ
diff --git a/src/apps/common/request_pin.py b/src/apps/common/request_pin.py
index e0c6fd82..09bd9c08 100644
--- a/src/apps/common/request_pin.py
+++ b/src/apps/common/request_pin.py
@@ -1,10 +1,12 @@
-from trezor import ui
+from trezor import ui, res
 from trezor import wire
 from trezor.utils import unimport
 
 if __debug__:
     matrix = None
 
+DEFAULT_CANCEL = res.load(ui.ICON_CLEAR)
+DEFAULT_LOCK = res.load(ui.ICON_LOCK)
 
 @unimport
 async def request_pin_on_display(ctx: wire.Context, code: int=None) -> str:
@@ -26,9 +28,9 @@ async def request_pin_on_display(ctx: wire.Context, code: int=None) -> str:
     def onchange():
         c = dialog.cancel
         if matrix.pin:
-            c.content = 'Clean'
+            c.content = DEFAULT_CANCEL
         else:
-            c.content = 'Cancel'
+            c.content = DEFAULT_LOCK
         c.taint()
         c.render()
 
diff --git a/src/trezor/res/clear.toig b/src/trezor/res/clear.toig
new file mode 100644
index 00000000..e8914f06
Binary files /dev/null and b/src/trezor/res/clear.toig differ
diff --git a/src/trezor/res/confirm.toig b/src/trezor/res/confirm.toig
new file mode 100644
index 00000000..fdd2c5d6
Binary files /dev/null and b/src/trezor/res/confirm.toig differ
diff --git a/src/trezor/res/lock.toig b/src/trezor/res/lock.toig
new file mode 100644
index 00000000..778e7ad6
Binary files /dev/null and b/src/trezor/res/lock.toig differ
diff --git a/src/trezor/res/send.toig b/src/trezor/res/send.toig
new file mode 100644
index 00000000..5edd9ec9
Binary files /dev/null and b/src/trezor/res/send.toig differ
diff --git a/src/trezor/ui/button.py b/src/trezor/ui/button.py
index c8749ae0..4236f99e 100644
--- a/src/trezor/ui/button.py
+++ b/src/trezor/ui/button.py
@@ -58,7 +58,7 @@ class Button(Widget):
                            s['border-color'],
                            ui.BG,
                            s['radius'])
-        display.bar_radius(ax + 1, ay + 1, aw - 2, ah - 2,
+        display.bar_radius(ax + 4, ay + 4, aw - 8, ah - 8,
                            s['bg-color'],
                            s['border-color'],
                            s['radius'])
@@ -70,7 +70,7 @@ class Button(Widget):
                                 s['bg-color'])
 
         else:
-            display.icon(ax, ay, self.content,
+            display.icon(tx - 15, ty - 20, self.content,
                          s['fg-color'],
                          s['bg-color'])
 
diff --git a/src/trezor/ui/confirm.py b/src/trezor/ui/confirm.py
index b529e0e6..1c69eb3d 100644
--- a/src/trezor/ui/confirm.py
+++ b/src/trezor/ui/confirm.py
@@ -1,17 +1,18 @@
 from micropython import const
 from trezor import loop
-from trezor import ui
+from trezor import ui, res
 from trezor.ui import Widget
 from trezor.ui.button import Button, BTN_CLICKED, BTN_STARTED
 from trezor.ui.loader import Loader
 
 CONFIRMED = const(1)
 CANCELLED = const(2)
-
+DEFAULT_CONFIRM = res.load(ui.ICON_CONFIRM)
+DEFAULT_CANCEL = res.load(ui.ICON_CLEAR)
 
 class ConfirmDialog(Widget):
 
-    def __init__(self, content, confirm='Confirm', cancel='Cancel'):
+    def __init__(self, content, confirm=DEFAULT_CONFIRM, cancel=DEFAULT_CANCEL):
         self.content = content
         if cancel is not None:
             self.confirm = Button((121, 240 - 48, 119, 48), confirm,
diff --git a/src/trezor/ui/style.py b/src/trezor/ui/style.py
index 11ad0f41..d6d895ab 100644
--- a/src/trezor/ui/style.py
+++ b/src/trezor/ui/style.py
@@ -48,6 +48,10 @@ FG = WHITE
 ICON_RESET    = 'trezor/res/header_icons/reset.toig'
 ICON_WIPE     = 'trezor/res/header_icons/wipe.toig'
 ICON_RECOVERY = 'trezor/res/header_icons/recovery.toig'
+ICON_CLEAR    = 'trezor/res/clear.toig'
+ICON_CONFIRM  = 'trezor/res/confirm.toig'
+ICON_LOCK     = 'trezor/res/lock.toig'
+ICON_SEND     = 'trezor/res/send.toig'
 
 # buttons
 BTN_DEFAULT = {
@@ -75,7 +79,7 @@ BTN_CANCEL = {
     'bg-color': RED,
     'fg-color': FG,
     'text-style': BOLD,
-    'border-color': RED,
+    'border-color': BG,
     'radius': RADIUS,
 }
 BTN_CANCEL_ACTIVE = {
@@ -89,7 +93,7 @@ BTN_CONFIRM = {
     'bg-color': GREEN,
     'fg-color': FG,
     'text-style': BOLD,
-    'border-color': GREEN,
+    'border-color': BG,
     'radius': RADIUS,
 }
 BTN_CONFIRM_ACTIVE = {