diff --git a/src/keepass2android/CreateDatabaseActivity.cs b/src/keepass2android/CreateDatabaseActivity.cs
index 305b3b65..3b885ca0 100644
--- a/src/keepass2android/CreateDatabaseActivity.cs
+++ b/src/keepass2android/CreateDatabaseActivity.cs
@@ -144,6 +144,8 @@ namespace keepass2android
 			
 		}
 
+	    readonly PasswordFont _passwordFont = new PasswordFont();
+
 		private void MakePasswordMaskedOrVisible()
 		{
 			TextView password = (TextView)FindViewById(Resource.Id.entry_password);
@@ -151,6 +153,7 @@ namespace keepass2android
 			if (_showPassword)
 			{
 				password.InputType = InputTypes.ClassText | InputTypes.TextVariationVisiblePassword;
+			    _passwordFont.ApplyTo(password);
 				confpassword.Visibility = ViewStates.Gone;
 			}
 			else
diff --git a/src/keepass2android/EntryActivity.cs b/src/keepass2android/EntryActivity.cs
index aa8e8893..17e7422a 100644
--- a/src/keepass2android/EntryActivity.cs
+++ b/src/keepass2android/EntryActivity.cs
@@ -130,7 +130,7 @@ namespace keepass2android
 
 	    public PwEntry Entry;
 
-		private static Typeface _passwordFont;
+		private PasswordFont _passwordFont = new PasswordFont();
 
 		internal bool _showPassword;
 		private int _pos;
@@ -899,11 +899,7 @@ namespace keepass2android
 		
 		private void SetPasswordTypeface(TextView textView)
 		{
-			if (_passwordFont == null)
-			{
-				_passwordFont = Typeface.CreateFromAsset(Assets, "SourceCodePro-Regular.ttf");
-			}
-			textView.Typeface = _passwordFont;	
+			_passwordFont.ApplyTo(textView);	
 		}
 
 	    private void PopulateText(int viewId, int containerViewId, String text)
diff --git a/src/keepass2android/PasswordActivity.cs b/src/keepass2android/PasswordActivity.cs
index a054c7e9..c89e5758 100644
--- a/src/keepass2android/PasswordActivity.cs
+++ b/src/keepass2android/PasswordActivity.cs
@@ -143,7 +143,7 @@ namespace keepass2android
 
 		private bool _performingLoad;
 		private bool _keepPasswordInOnResume;
-	    private Typeface _passwordFont;
+	    
 
         private ActionBarDrawerToggle mDrawerToggle;
 	    private DrawerLayout _drawerLayout;
@@ -724,7 +724,7 @@ namespace keepass2android
 			behavior.OnNestedFling(FindViewById<CoordinatorLayout>(Resource.Id.main_content), appbarLayout, null, 0, 200, true);
 		}
 
-        
+	    readonly PasswordFont _passwordFont = new PasswordFont();
 
 		protected override void OnCreate(Bundle savedInstanceState)
 		{
@@ -871,32 +871,31 @@ namespace keepass2android
 
 
 			mDrawerTitle = Title;
-			FindViewById<DrawerLayout>(Resource.Id.drawer_layout);
-			var rootview = FindViewById<MeasuringRelativeLayout>(Resource.Id.relative_layout);
-			rootview.ViewTreeObserver.GlobalLayout += (sender, args2) =>
-			{
-				Android.Util.Log.Debug("KP2A", "GlobalLayout");
-				var args = _measureArgs;
-				if (args == null)
-					return;
-				Android.Util.Log.Debug("KP2A", "ActualHeight=" + args.ActualHeight);
-				Android.Util.Log.Debug("KP2A", "ProposedHeight=" + args.ProposedHeight);
-				if (args.ActualHeight < args.ProposedHeight)
-					UncollapseToolbar();
-				if (args.ActualHeight > args.ProposedHeight)
-					CollapseToolbar();
-			};
-			rootview.MeasureEvent += (sender, args) =>
-			{
-				//Snackbar.Make(rootview, "height="+args.ActualHeight, Snackbar.LengthLong).Show();
-				_measureArgs = args;
-			};
+			InitializeToolbarCollapsing();
 
-			if ((int)Build.VERSION.SdkInt >= 23)
+		    if ((int)Build.VERSION.SdkInt >= 23)
 				RequestPermissions(new[] { Manifest.Permission.UseFingerprint }, FingerprintPermissionRequestCode);
 			
 		}
 
+	    private void InitializeToolbarCollapsing()
+	    {
+	        var rootview = FindViewById<MeasuringRelativeLayout>(Resource.Id.relative_layout);
+	        rootview.ViewTreeObserver.GlobalLayout += (sender, args2) =>
+	        {
+	            Android.Util.Log.Debug("KP2A", "GlobalLayout");
+	            if (_measureArgs == null)
+	                return;
+	            Android.Util.Log.Debug("KP2A", "ActualHeight=" + _measureArgs.ActualHeight);
+	            Android.Util.Log.Debug("KP2A", "ProposedHeight=" + _measureArgs.ProposedHeight);
+	            if (_measureArgs.ActualHeight < _measureArgs.ProposedHeight)
+	                UncollapseToolbar();
+	            if (_measureArgs.ActualHeight > _measureArgs.ProposedHeight)
+	                CollapseToolbar();
+	        };
+	        rootview.MeasureEvent += (sender, args) => { _measureArgs = args; };
+	    }
+
 	    private const string Kp2aKeyProviderStringPrefix = "_KP2A_KEYTYPES:";
 
         private string GetKeyProviderString()
@@ -1570,7 +1569,7 @@ namespace keepass2android
 					var ioc = IOConnectionInfo.UnserializeFromString(_keyFile);
 					using (var stream = App.Kp2a.GetFileStorage(ioc).OpenFileForRead(ioc))
 					{
-						byte[] keyfileData = StreamToMemoryStream(stream).ToArray();
+						byte[] keyfileData = Util.StreamToMemoryStream(stream).ToArray();
 						compositeKey.AddUserKey(new KcpKeyFile(keyfileData, ioc, true));
 					}
 				}
@@ -1651,7 +1650,7 @@ namespace keepass2android
 			if (_showPassword)
 			{
 				password.InputType = InputTypes.ClassText | InputTypes.TextVariationVisiblePassword;
-                SetPasswordTypeface(password);
+                _passwordFont.ApplyTo(password);
 			}
 			else
 			{
@@ -1662,22 +1661,10 @@ namespace keepass2android
 
 		protected override void OnPause()
 		{
-			if (_fingerprintDec != null)
-			{
-				_fingerprintDec.StopListening();
-			}
-			base.OnPause();
+		    _fingerprintDec?.StopListening();
+		    base.OnPause();
 		}
 
-		private void SetPasswordTypeface(TextView textView)
-	    {
-            if (_passwordFont == null)
-            {
-                _passwordFont = Typeface.CreateFromAsset(Assets, "SourceCodePro-Regular.ttf");
-            }
-            textView.Typeface = _passwordFont;	
-	    }
-
 	    private void SetNewDefaultFile()
 		{
 //Don't allow the current file to be the default if we don't have stored credentials
@@ -1735,18 +1722,13 @@ namespace keepass2android
 			var fileStorage = App.Kp2a.GetFileStorage(_ioConnection);
 			var stream = fileStorage.OpenFileForRead(_ioConnection);
 
-			var memoryStream = StreamToMemoryStream(stream);
+			var memoryStream = Util.StreamToMemoryStream(stream);
 
 			Kp2aLog.Log("Pre-loading database file completed");
 
 			return memoryStream;
 		}
 
-		private static MemoryStream StreamToMemoryStream(Stream stream)
-		{
-			return Util.StreamToMemoryStream(stream);
-		}
-
 		protected override void OnSaveInstanceState(Bundle outState)
 		{
 			base.OnSaveInstanceState(outState);
diff --git a/src/keepass2android/PasswordFont.cs b/src/keepass2android/PasswordFont.cs
new file mode 100644
index 00000000..7324cfa9
--- /dev/null
+++ b/src/keepass2android/PasswordFont.cs
@@ -0,0 +1,18 @@
+using Android.Graphics;
+using Android.Widget;
+
+namespace keepass2android
+{
+    public class PasswordFont
+    {
+        private static Typeface _passwordFont;
+
+        public void ApplyTo(TextView view)
+        {
+            if (_passwordFont == null)
+                _passwordFont = Typeface.CreateFromAsset(view.Context.Assets, "SourceCodePro-Regular.ttf");
+
+            view.Typeface = _passwordFont;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/keepass2android/keepass2android.csproj b/src/keepass2android/keepass2android.csproj
index ad432daf..98d652d4 100644
--- a/src/keepass2android/keepass2android.csproj
+++ b/src/keepass2android/keepass2android.csproj
@@ -220,6 +220,7 @@
     <Compile Include="KpEntryTemplatedEdit.cs" />
     <Compile Include="MeasuringRelativeLayout.cs" />
     <Compile Include="NfcOtpActivity.cs" />
+    <Compile Include="PasswordFont.cs" />
     <Compile Include="pluginhost\PluginArrayAdapter.cs" />
     <Compile Include="pluginhost\PluginDatabase.cs" />
     <Compile Include="pluginhost\PluginDetailsActivity.cs" />