diff --git a/app/base.css b/app/base.css
index f4e2e061..52fbfafe 100644
--- a/app/base.css
+++ b/app/base.css
@@ -69,6 +69,10 @@ a {
   border-radius: 5px;
 }
 
+.btn:hover {
+  background-color: var(--primaryControlHoverColor);
+}
+
 .btn--cancel {
   color: var(--errorColor);
   background: var(--pageBGColor);
@@ -83,6 +87,10 @@ a {
   cursor: auto;
 }
 
+.btn--cancel:hover {
+  background-color: var(--pageBGColor);
+}
+
 .input {
   flex: 2 0 auto;
   border: 1px solid var(--primaryControlBGColor);
diff --git a/app/dragManager.js b/app/dragManager.js
index c8a02fcf..3d4d810e 100644
--- a/app/dragManager.js
+++ b/app/dragManager.js
@@ -11,7 +11,9 @@ export default function(state, emitter) {
     document.body.addEventListener('drop', event => {
       if (state.route === '/' && !state.uploading) {
         event.preventDefault();
-        document.querySelector('.upload-window').classList.remove('ondrag');
+        document
+          .querySelector('.uploadArea')
+          .classList.remove('uploadArea--dragging');
         const target = event.dataTransfer;
         if (target.files.length === 0) {
           return;
diff --git a/app/pages/welcome/welcome.css b/app/pages/welcome/welcome.css
index 298c1a3a..cefe3dfe 100644
--- a/app/pages/welcome/welcome.css
+++ b/app/pages/welcome/welcome.css
@@ -53,10 +53,6 @@
   padding: 0 10px;
 }
 
-.btn--file:hover {
-  background-color: var(--primaryControlHoverColor);
-}
-
 .inputFile {
   opacity: 0;
   overflow: hidden;
diff --git a/app/templates/downloadButton/downloadButton.css b/app/templates/downloadButton/downloadButton.css
index 834dc76f..265535ce 100644
--- a/app/templates/downloadButton/downloadButton.css
+++ b/app/templates/downloadButton/downloadButton.css
@@ -4,7 +4,3 @@
   margin-top: 20px;
   margin-bottom: 30px;
 }
-
-.btn--download:hover {
-  background-color: var(--primaryControlHoverColor);
-}
diff --git a/app/templates/downloadPassword/downloadPassword.css b/app/templates/downloadPassword/downloadPassword.css
index 345fd74d..dd67db2d 100644
--- a/app/templates/downloadPassword/downloadPassword.css
+++ b/app/templates/downloadPassword/downloadPassword.css
@@ -16,8 +16,11 @@
 }
 
 @media (max-device-width: 520px), (max-width: 520px) {
+  .passwordSection {
+    width: 100%;
+  }
+
   .passwordForm {
     flex-direction: column;
-    padding-left: 0;
   }
 }
diff --git a/app/templates/passwordInput/passwordInput.css b/app/templates/passwordInput/passwordInput.css
index c478530c..4f564168 100644
--- a/app/templates/passwordInput/passwordInput.css
+++ b/app/templates/passwordInput/passwordInput.css
@@ -36,8 +36,4 @@
     flex-direction: column;
     width: inherit;
   }
-
-  .inputBtn--loading {
-    width: inherit;
-  }
 }