Changed icon and format of encrypt/decrypt screen
UI padding
merge with master