diff --git a/src/css/custom.css b/src/css/custom.css
index a97bb89cd8..8e4eb7e430 100644
--- a/src/css/custom.css
+++ b/src/css/custom.css
@@ -301,8 +301,6 @@ navbar .navbar .navbar__link[href*="self-managed"] {
 
 .component-block {
   transition: all 0.3s ease;
-  background-color: #000;
-  color: white;
   border-radius: 25px;
   box-shadow: 4px 4px 4px 1px lightgray;
   margin: 2px;
@@ -313,6 +311,15 @@ navbar .navbar .navbar__link[href*="self-managed"] {
   transition: all 0.3s ease;
 }
 
+.component-block a {
+  color: var(--ifm-color-black);
+}
+
+.component-block a:hover {
+  color: var(--ifm-color-primary);
+  text-decoration: none;
+}
+
 div[class^="announcementBar_"] {
   font-size: 120%;
   padding: 1em 0;
diff --git a/src/pages/index.js b/src/pages/index.js
index c82a079a8b..a8e1742d61 100644
--- a/src/pages/index.js
+++ b/src/pages/index.js
@@ -55,15 +55,15 @@ function Feature({ imageUrl, url, title, description }) {
   const imgUrl = useBaseUrl(imageUrl);
   return (
     <div className={clsx("col component-block", styles.feature)}>
-      {imgUrl && (
-        <div className="text--center">
-          <Link to={useBaseUrl(url)}>
+      <Link to={useBaseUrl(url)}>
+        {imgUrl && (
+          <div className="text--center">
             <img className={styles.featureImage} src={imgUrl} alt={title} />
-          </Link>
-        </div>
-      )}
-      <h3>{title}</h3>
-      <p>{description}</p>
+          </div>
+        )}
+        <h3>{title}</h3>
+        <p>{description}</p>
+      </Link>
     </div>
   );
 }
diff --git a/static/img/Camunda-self-managed.png b/static/img/Camunda-self-managed.png
index db0c6dd126..5cd8ad15a9 100644
Binary files a/static/img/Camunda-self-managed.png and b/static/img/Camunda-self-managed.png differ
diff --git a/static/img/confused-person.png b/static/img/confused-person.png
index 5241255185..59fe6a775a 100644
Binary files a/static/img/confused-person.png and b/static/img/confused-person.png differ
diff --git a/static/img/customer-success.png b/static/img/customer-success.png
index a9771cdc29..d663a7298e 100644
Binary files a/static/img/customer-success.png and b/static/img/customer-success.png differ
diff --git a/static/img/education.png b/static/img/education.png
index cd2235a842..266c64e59f 100644
Binary files a/static/img/education.png and b/static/img/education.png differ
diff --git a/static/img/handbook.png b/static/img/handbook.png
index 5746715203..ede214f5f5 100644
Binary files a/static/img/handbook.png and b/static/img/handbook.png differ
diff --git a/static/img/homegrown-workflow.png b/static/img/homegrown-workflow.png
index 4242462125..1268ef7444 100644
Binary files a/static/img/homegrown-workflow.png and b/static/img/homegrown-workflow.png differ