diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss
index ae0e7ad2f8..928c54bc10 100644
--- a/apps/theming/css/theming.scss
+++ b/apps/theming/css/theming.scss
@@ -84,10 +84,6 @@ $invert: luma($color-primary) > 0.6;
 			@include icon-color('checkbox-mark', 'actions', $color-white, 1, true);
 		}
 	}
-	/* Always give primary button a border for light primary colors */
-	.primary {
-		border-color: $color-border !important;
-	}
 } @else {
 	#appmenu:not(.inverted) svg {
 		filter: none;
@@ -214,11 +210,12 @@ input.primary,
 		&.primary:not(:disabled) {
 			background-color: var(--color-background-dark);
 			color: var(--color-main-text);
-			border: 1px solid var(--color-background-darker);
+			border-color: var(--color-text-lighter);
 
 			&:hover, &:focus, &:active {
 				background-color: var(--color-background-darker);
 				color: var(--color-main-text);
+				border-color: var(--color-text);
 			}
 		}
 	}
diff --git a/apps/theming/tests/CapabilitiesTest.php b/apps/theming/tests/CapabilitiesTest.php
index 775b588c78..332d755655 100644
--- a/apps/theming/tests/CapabilitiesTest.php
+++ b/apps/theming/tests/CapabilitiesTest.php
@@ -74,7 +74,7 @@ class CapabilitiesTest extends TestCase  {
 				'slogan' => 'slogan',
 				'color' => '#FFFFFF',
 				'color-text' => '#000000',
-				'color-element' => '#dddddd',
+				'color-element' => '#aaaaaa',
 				'logo' => 'http://absolute/logo',
 				'background' => 'http://absolute/background',
 				'background-plain' => false,
diff --git a/apps/theming/tests/UtilTest.php b/apps/theming/tests/UtilTest.php
index d0263e1122..a36c733068 100644
--- a/apps/theming/tests/UtilTest.php
+++ b/apps/theming/tests/UtilTest.php
@@ -105,7 +105,7 @@ class UtilTest extends TestCase {
 
 	public function testElementColorOnBrightBackground() {
 		$elementColor = $this->util->elementColor('#ffffff');
-		$this->assertEquals('#dddddd', $elementColor);
+		$this->assertEquals('#aaaaaa', $elementColor);
 	}
 
 	public function testGenerateRadioButtonWhite() {