diff --git a/css/_layout.css b/css/_layout.css
index 93760ec..163a04a 100644
--- a/css/_layout.css
+++ b/css/_layout.css
@@ -15,6 +15,8 @@
 }
 
 #body-login {
+	overflow-x: hidden;
+
 	#header .logo {
 		background-image: none;
 	}
diff --git a/css/files_sharing.css b/css/files_sharing.css
index 59bf744..1786303 100644
--- a/css/files_sharing.css
+++ b/css/files_sharing.css
@@ -14,7 +14,7 @@
 	margin: 0;
 	display: flex;
 	width: 100%;
-	height: 100%;
+	height: calc(100% - var(--footer-height));
 	border-radius: 0;
 	box-sizing: content-box;
 
@@ -27,6 +27,7 @@
 
 	div#files-public-content, #public-upload {
 		margin-bottom: var(--footer-height);
+		padding-bottom: var(--footer-height);
 
 		.files-controls {
 			background-color: var(--ion-color-main-background);
@@ -111,7 +112,7 @@
 		}
 
 		#downloadFile.button, div#emptycontent > .button.icon-upload {
-			margin-top: 48px;
+			margin-top: 36px;
 			background-color: var(--ion-button-secondary-background-default);
 			border: var(--ion-button-secondary-border-default);
 			color: var(--ion-button-secondary-text);
@@ -385,6 +386,17 @@
 	}
 }
 
+#body-public, #body-login {
+	footer {
+		width: calc(100% - var(--body-container-margin));
+		border-radius: 0;
+		bottom: 0;
+		left: -10px;
+		margin-bottom: 0;
+		max-width: 100%;
+	}
+}
+
 #notemenu {
 	#note-content {
 		display: none;